From owner-svn-src-all@FreeBSD.ORG Mon Oct 29 13:16:33 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A5D8ECCC; Mon, 29 Oct 2012 13:16:33 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8E7668FC15; Mon, 29 Oct 2012 13:16:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9TDGXia068333; Mon, 29 Oct 2012 13:16:33 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9TDGXIX068331; Mon, 29 Oct 2012 13:16:33 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201210291316.q9TDGXIX068331@svn.freebsd.org> From: Andre Oppermann Date: Mon, 29 Oct 2012 13:16:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r242311 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2012 13:16:33 -0000 Author: andre Date: Mon Oct 29 13:16:33 2012 New Revision: 242311 URL: http://svn.freebsd.org/changeset/base/242311 Log: Forced commit to provide the correct commit message to r242251: Defer sending an independent window update if a delayed ACK is pending saving a packet. The window update then gets piggy-backed on the next already scheduled ACK. Added grammar fixes as well. MFC after: 2 weeks Modified: head/sys/netinet/tcp_output.c Modified: head/sys/netinet/tcp_output.c ============================================================================== --- head/sys/netinet/tcp_output.c Mon Oct 29 12:37:39 2012 (r242310) +++ head/sys/netinet/tcp_output.c Mon Oct 29 13:16:33 2012 (r242311) @@ -547,13 +547,13 @@ after_sack_rexmit: /* * Sending of standalone window updates. * - * Window updates important when we close our window due to a full - * socket buffer and are opening it again after the application + * Window updates are important when we close our window due to a + * full socket buffer and are opening it again after the application * reads data from it. Once the window has opened again and the * remote end starts to send again the ACK clock takes over and * provides the most current window information. * - * We must avoid to the silly window syndrome whereas every read + * We must avoid the silly window syndrome whereas every read * from the receive buffer, no matter how small, causes a window * update to be sent. We also should avoid sending a flurry of * window updates when the socket buffer had queued a lot of data