From owner-svn-src-user@FreeBSD.ORG  Thu Jun 14 12:38:52 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2955C1065674;
	Thu, 14 Jun 2012 12:38:52 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 160578FC1F;
	Thu, 14 Jun 2012 12:38:52 +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 q5ECcpP9094606;
	Thu, 14 Jun 2012 12:38:51 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5ECcpJm094604;
	Thu, 14 Jun 2012 12:38:51 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201206141238.q5ECcpJm094604@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Thu, 14 Jun 2012 12:38:51 +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: r237064 - user/andre/tcp_workqueue/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: Thu, 14 Jun 2012 12:38:52 -0000

Author: andre
Date: Thu Jun 14 12:38:51 2012
New Revision: 237064
URL: http://svn.freebsd.org/changeset/base/237064

Log:
  Add SACK_PERMIT to the list of TCP options that are switched off after
  retransmitting a SYN three times.

Modified:
  user/andre/tcp_workqueue/sys/netinet/tcp_timer.c

Modified: user/andre/tcp_workqueue/sys/netinet/tcp_timer.c
==============================================================================
--- user/andre/tcp_workqueue/sys/netinet/tcp_timer.c	Thu Jun 14 12:37:41 2012	(r237063)
+++ user/andre/tcp_workqueue/sys/netinet/tcp_timer.c	Thu Jun 14 12:38:51 2012	(r237064)
@@ -566,7 +566,7 @@ tcp_timer_rexmt(void * xtp)
 	 * unknown-to-them TCP options.
 	 */
 	if ((tp->t_state == TCPS_SYN_SENT) && (tp->t_rxtshift == 3))
-		tp->t_flags &= ~(TF_REQ_SCALE|TF_REQ_TSTMP);
+		tp->t_flags &= ~(TF_REQ_SCALE|TF_REQ_TSTMP|TF_SACK_PERMIT);
 	/*
 	 * If we backed off this far, our srtt estimate is probably bogus.
 	 * Clobber it so we'll take the next rtt measurement as our srtt;