Date: Fri, 11 Feb 2011 15:14:51 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r218575 - releng/8.2/sys/netinet Message-ID: <201102111514.p1BFEpea064729@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Fri Feb 11 15:14:51 2011 New Revision: 218575 URL: http://svn.freebsd.org/changeset/base/218575 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/8.2/sys/netinet/tcp_usrreq.c Directory Properties: releng/8.2/sys/ (props changed) releng/8.2/sys/amd64/include/xen/ (props changed) releng/8.2/sys/cddl/contrib/opensolaris/ (props changed) releng/8.2/sys/contrib/dev/acpica/ (props changed) releng/8.2/sys/contrib/pf/ (props changed) Modified: releng/8.2/sys/netinet/tcp_usrreq.c ============================================================================== --- releng/8.2/sys/netinet/tcp_usrreq.c Fri Feb 11 15:13:03 2011 (r218574) +++ releng/8.2/sys/netinet/tcp_usrreq.c Fri Feb 11 15:14:51 2011 (r218575) @@ -1331,9 +1331,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102111514.p1BFEpea064729>