From owner-svn-src-user@FreeBSD.ORG  Fri Apr 20 16:56:14 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E359D1065672;
	Fri, 20 Apr 2012 16:56:14 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF8578FC0A;
	Fri, 20 Apr 2012 16:56:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3KGuEHn047855;
	Fri, 20 Apr 2012 16:56:14 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3KGuE5H047853;
	Fri, 20 Apr 2012 16:56:14 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201204201656.q3KGuE5H047853@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 20 Apr 2012 16:56:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234500 - user/np/toe_iwarp/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2012 16:56:15 -0000

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);