From owner-svn-src-all@FreeBSD.ORG  Sat Aug 14 20:03:33 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8999810656A3;
	Sat, 14 Aug 2010 20:03:33 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 780F18FC12;
	Sat, 14 Aug 2010 20:03:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7EK3X8w037450;
	Sat, 14 Aug 2010 20:03:33 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7EK3XW0037448;
	Sat, 14 Aug 2010 20:03:33 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201008142003.o7EK3XW0037448@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sat, 14 Aug 2010 20:03:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211313 - stable/7/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Aug 2010 20:03:33 -0000

Author: andre
Date: Sat Aug 14 20:03:32 2010
New Revision: 211313
URL: http://svn.freebsd.org/changeset/base/211313

Log:
  MFC r210666:
  
    Fix a bug in syncache where the initial CWND for new incoming connections
    was limited to one segment under the faulty assumption of a retransmit.
    Due to this the opportunity to initialize the increased congestion window
    according to RFC3390 was missed.

Modified:
  stable/7/sys/netinet/tcp_syncache.c

Modified: stable/7/sys/netinet/tcp_syncache.c
==============================================================================
--- stable/7/sys/netinet/tcp_syncache.c	Sat Aug 14 19:36:48 2010	(r211312)
+++ stable/7/sys/netinet/tcp_syncache.c	Sat Aug 14 20:03:32 2010	(r211313)
@@ -821,8 +821,9 @@ syncache_socket(struct syncache *sc, str
 
 	/*
 	 * If the SYN,ACK was retransmitted, reset cwnd to 1 segment.
+	 * NB: sc_rxmits counts all SYN,ACK transmits, not just retransmits.
 	 */
-	if (sc->sc_rxmits)
+	if (sc->sc_rxmits > 1)
 		tp->snd_cwnd = tp->t_maxseg;
 	tcp_timer_activate(tp, TT_KEEP, tcp_keepinit);