svn commit: r199403 - stable/6/sys/netinet

[John Baldwin]

Author: jhb
Date: Tue Nov 17 16:18:03 2009
New Revision: 199403
URL: http://svn.freebsd.org/changeset/base/199403

Log:
  MFC 198990:
  Several years ago a feature was added to TCP that casued soreceive() to
  send an ACK right away if data was drained from a TCP socket that had
  previously advertised a zero-sized window.  The current code requires the
  receive window to be exactly zero for this to kick in.  If window scaling is
  enabled and the window is smaller than the scale, then the effective window
  that is advertised is zero.  However, in that case the zero-sized window
  handling is not enabled because the window is not exactly zero.  The fix
  changes the code to check the raw window value against zero.

Modified:
  stable/6/sys/netinet/tcp_output.c
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/conf/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/netinet/tcp_output.c
==============================================================================
--- stable/6/sys/netinet/tcp_output.c	Tue Nov 17 16:17:44 2009	(r199402)
+++ stable/6/sys/netinet/tcp_output.c	Tue Nov 17 16:18:03 2009	(r199403)
@@ -893,7 +893,7 @@ send:
 	 * to read more data then can be buffered prior to transmitting on
 	 * the connection.
 	 */
-	if (recwin == 0)
+	if (th->th_win == 0)
 		tp->t_flags |= TF_RXWIN0SENT;
 	else
 		tp->t_flags &= ~TF_RXWIN0SENT;