svn commit: r234500 - user/np/toe_iwarp/sys/netinet

[Navdeep Parhar]

Author: np
Date: Fri Apr 20 16:56:14 2012
New Revision: 234500
URL: http://svn.freebsd.org/changeset/base/234500

Log:
  Avoid arming the TT_KEEP timer for TCP/IPv6 TOE active open too, just like
  for TCP/IP.

Modified:
  user/np/toe_iwarp/sys/netinet/tcp_usrreq.c

Modified: user/np/toe_iwarp/sys/netinet/tcp_usrreq.c
==============================================================================
--- user/np/toe_iwarp/sys/netinet/tcp_usrreq.c	Fri Apr 20 16:53:54 2012	(r234499)
+++ user/np/toe_iwarp/sys/netinet/tcp_usrreq.c	Fri Apr 20 16:56:14 2012	(r234500)
@@ -553,6 +553,7 @@ tcp6_usr_connect(struct socket *so, stru
 	    (error = tcp_offload_connect(so, nam)) == 0)
 		goto out;
 #endif
+	tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
 	error = tcp_output(tp);
 
 out:
@@ -1218,7 +1219,6 @@ tcp6_connect(struct tcpcb *tp, struct so
 	soisconnecting(so);
 	TCPSTAT_INC(tcps_connattempt);
 	tp->t_state = TCPS_SYN_SENT;
-	tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
 	tp->iss = tcp_new_isn(tp);
 	tcp_sendseqinit(tp);