From patchwork Wed Sep 1 10:28:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerrit Renker X-Patchwork-Id: 63358 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C3FFDB7157 for ; Wed, 1 Sep 2010 20:28:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754505Ab0IAK2q (ORCPT ); Wed, 1 Sep 2010 06:28:46 -0400 Received: from dee.erg.abdn.ac.uk ([139.133.204.82]:63122 "EHLO erg.abdn.ac.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752155Ab0IAK2q (ORCPT ); Wed, 1 Sep 2010 06:28:46 -0400 Received: from laptev.erg.abdn.ac.uk (Debian-exim@ra-gerrit.erg.abdn.ac.uk [139.133.204.38]) by erg.abdn.ac.uk (8.13.4/8.13.4) with ESMTP id o81ASYKl005952 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Wed, 1 Sep 2010 11:28:35 +0100 (BST) Received: from gerrit by laptev.erg.abdn.ac.uk with local (Exim 4.69) (envelope-from ) id 1OqkYV-0001UE-4V; Wed, 01 Sep 2010 12:28:35 +0200 Date: Wed, 1 Sep 2010 12:28:35 +0200 From: Gerrit Renker To: Ilpo J?rvinen Cc: David Miller , Netdev Subject: Re: net-next-2.6 [PATCH 1/1] tcp: add missing initial window (RFC 3390) for tcp_output Message-ID: <20100901102835.GA5686@gerrit.erg.abdn.ac.uk> Mail-Followup-To: Gerrit Renker , Ilpo J?rvinen , David Miller , Netdev References: <1283145794-5615-1-git-send-email-gerrit@erg.abdn.ac.uk> <1283145794-5615-2-git-send-email-gerrit@erg.abdn.ac.uk> <1283145794-5615-3-git-send-email-gerrit@erg.abdn.ac.uk> <1283145794-5615-4-git-send-email-gerrit@erg.abdn.ac.uk> <20100901052355.GA5379@gerrit.erg.abdn.ac.uk> <20100901053443.GB5379@gerrit.erg.abdn.ac.uk> <428BF15F-19DC-459A-B54A-EC273ECF537E@comsys.rwth-aachen.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <428BF15F-19DC-459A-B54A-EC273ECF537E@comsys.rwth-aachen.de> User-Agent: Mutt/1.5.18 (2008-05-17) X-ERG-MailScanner: Found to be clean X-ERG-MailScanner-From: gerrit@erg.abdn.ac.uk X-Spam-Status: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Addressing comments from Alexander, removing comment. >>>>>>>>>>>>>>>>>>>>>>> Patch v2 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< tcp: update also tcp_output with regard to RFC 5681 Thanks to Ilpo Jarvinen, this updates also the initial window setting for tcp_output with regard to RFC 5681. Signed-off-by: Gerrit Renker --- net/ipv4/tcp_output.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -224,16 +224,10 @@ void tcp_select_initial_window(int __spa } } - /* Set initial window to value enough for senders, - * following RFC2414. Senders, not following this RFC, - * will be satisfied with 2. - */ + /* Set initial window to value enough for senders, following RFC5681. */ if (mss > (1 << *rcv_wscale)) { - int init_cwnd = 4; - if (mss > 1460 * 3) - init_cwnd = 2; - else if (mss > 1460) - init_cwnd = 3; + int init_cwnd = rfc3390_bytes_to_packets(mss); + /* when initializing use the value from init_rcv_wnd * rather than the default from above */