svn commit: r190800 - head/sys/netinet

[Bjoern A. Zeeb]

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