Message ID | 20100901102835.GA5686@gerrit.erg.abdn.ac.uk |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Gerrit Renker <gerrit@erg.abdn.ac.uk> Date: Wed, 1 Sep 2010 12:28:35 +0200 > 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 <gerrit@erg.abdn.ac.uk> Applied to net-next-2.6, thanks. -- 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 */