From owner-svn-src-stable@FreeBSD.ORG  Fri Apr 10 12:32:44 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A298B1065675;
	Fri, 10 Apr 2009 12:32:44 +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 8F5EC8FC19;
	Fri, 10 Apr 2009 12:32:44 +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 n3ACWic7048560;
	Fri, 10 Apr 2009 12:32:44 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3ACWiAx048559;
	Fri, 10 Apr 2009 12:32:44 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200904101232.n3ACWiAx048559@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Fri, 10 Apr 2009 12:32:44 +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: r190892 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2009 12:32:45 -0000

Author: bz
Date: Fri Apr 10 12:32:44 2009
New Revision: 190892
URL: http://svn.freebsd.org/changeset/base/190892

Log:
  MFC r190800:
  
    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)
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet/tcp_usrreq.c

Modified: stable/7/sys/netinet/tcp_usrreq.c
==============================================================================
--- stable/7/sys/netinet/tcp_usrreq.c	Fri Apr 10 11:15:34 2009	(r190891)
+++ stable/7/sys/netinet/tcp_usrreq.c	Fri Apr 10 12:32:44 2009	(r190892)
@@ -1153,7 +1153,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);