From owner-svn-src-all@FreeBSD.ORG  Tue Apr  7 14:42:41 2009
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 CC5B01065670;
	Tue,  7 Apr 2009 14:42:41 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A899E8FC3B;
	Tue,  7 Apr 2009 14:42:41 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n37Egeix011568;
	Tue, 7 Apr 2009 14:42:40 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n37EgehW011567;
	Tue, 7 Apr 2009 14:42:40 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200904071442.n37EgehW011567@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Tue, 7 Apr 2009 14:42:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190800 - head/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: Tue, 07 Apr 2009 14:42:42 -0000

Author: bz
Date: Tue Apr  7 14:42:40 2009
New Revision: 190800
URL: http://svn.freebsd.org/changeset/base/190800

Log:
  With the right comparison we get a proper wscale value and thus
  more adequate TCP performance with IPv6.
  
  Changes for IPv4, r166403 and r172795, both ignored the
  IPv6 counterpart and left it in the state of art of year 2000.
  
  The same logic in syncache already shares code between v4 and v6 so
  things do not need to be adapted there.
  
  Reported by:	Steinar Haug (sthaug nethelp.no)
  Tested by:	Steinar Haug (sthaug nethelp.no)
  MFC after:	3 days

Modified:
  head/sys/netinet/tcp_usrreq.c

Modified: head/sys/netinet/tcp_usrreq.c
==============================================================================
--- head/sys/netinet/tcp_usrreq.c	Tue Apr  7 13:51:41 2009	(r190799)
+++ head/sys/netinet/tcp_usrreq.c	Tue Apr  7 14:42:40 2009	(r190800)
@@ -1173,7 +1173,7 @@ tcp6_connect(struct tcpcb *tp, struct so
 
 	/* Compute window scaling to request.  */
 	while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
-	    (TCP_MAXWIN << tp->request_r_scale) < so->so_rcv.sb_hiwat)
+	    (TCP_MAXWIN << tp->request_r_scale) < sb_max)
 		tp->request_r_scale++;
 
 	soisconnecting(so);