svn commit: r218576 - releng/7.4/sys/netinet

[John Baldwin]

Author: jhb
Date: Fri Feb 11 15:15:08 2011
New Revision: 218576
URL: http://svn.freebsd.org/changeset/base/218576

Log:
  MFC 218271:
  When turning off TCP_NOPUSH, only call tcp_output() to immediately flush
  any pending data if the connection is established.
  
  Approved by:	re (kib)

Modified:
  releng/7.4/sys/netinet/tcp_usrreq.c
Directory Properties:
  releng/7.4/sys/   (props changed)
  releng/7.4/sys/cddl/contrib/opensolaris/   (props changed)
  releng/7.4/sys/contrib/dev/acpica/   (props changed)
  releng/7.4/sys/contrib/pf/   (props changed)

Modified: releng/7.4/sys/netinet/tcp_usrreq.c
==============================================================================
--- releng/7.4/sys/netinet/tcp_usrreq.c	Fri Feb 11 15:14:51 2011	(r218575)
+++ releng/7.4/sys/netinet/tcp_usrreq.c	Fri Feb 11 15:15:08 2011	(r218576)
@@ -1318,9 +1318,10 @@ tcp_ctloutput(struct socket *so, struct 
 			INP_WLOCK_RECHECK(inp);
 			if (optval)
 				tp->t_flags |= TF_NOPUSH;
-			else {
+			else if (tp->t_flags & TF_NOPUSH) {
 				tp->t_flags &= ~TF_NOPUSH;
-				error = tcp_output(tp);
+				if (TCPS_HAVEESTABLISHED(tp->t_state))
+					error = tcp_output(tp);
 			}
 			INP_WUNLOCK(inp);
 			break;