svn commit: r190892 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netinet

[Bjoern A. Zeeb]

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