From: Chris Wright Date: Fri, 30 Sep 2005 01:54:34 +0000 (-0700) Subject: Add tcp congestion control fix from shemminger X-Git-Tag: v2.6.13.3~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58a0b2a22112c4c343698ce578ecda944a3bcee3;p=thirdparty%2Fkernel%2Fstable-queue.git Add tcp congestion control fix from shemminger --- diff --git a/queue/series b/queue/series index baa49f8f73d..b45bf51377e 100644 --- a/queue/series +++ b/queue/series @@ -6,3 +6,4 @@ missing-acct-mm-calls-in-compat_do_execve.patch uml-fix-x86_64-page-leak.patch check-connect-status-for-IPv6-UDP-socket.patch skge-set-mac-address-oops-with-bonding.patch +tcp-set-default-congestion-control-correctly.patch diff --git a/queue/tcp-set-default-congestion-control-correctly.patch b/queue/tcp-set-default-congestion-control-correctly.patch new file mode 100644 index 00000000000..8f23515f79a --- /dev/null +++ b/queue/tcp-set-default-congestion-control-correctly.patch @@ -0,0 +1,33 @@ +From stable-bounces@linux.kernel.org Tue Sep 20 13:39:52 2005 +Date: Tue, 20 Sep 2005 13:39:47 -0700 +From: Stephen Hemminger +To: "David S. Miller" +Cc: netdev@vger.kernel.org, stable@kernel.org, Joel Sing +Subject: [PATCH] tcp: set default congestion control correctly for incoming connections + +Patch from Joel Sing to fix the default congestion control algorithm for incoming connections. If a new congestion control handler is added (via module), +it should become the default for new connections. Instead, the incoming +connections use reno. The cause is incorrect +initialisation causes the tcp_init_congestion_control() function to return +after the initial if test fails. + +Signed-off-by: Stephen Hemminger +Acked-by: "David S. Miller" +Signed-off-by: Chris Wright +--- + net/ipv4/tcp_minisocks.c | 2 +- + 1 files changed, 1 insertion(+), 1 deletion(-) + +Index: linux-2.6.13.y/net/ipv4/tcp_minisocks.c +=================================================================== +--- linux-2.6.13.y.orig/net/ipv4/tcp_minisocks.c ++++ linux-2.6.13.y/net/ipv4/tcp_minisocks.c +@@ -774,7 +774,7 @@ struct sock *tcp_create_openreq_child(st + newtp->frto_counter = 0; + newtp->frto_highmark = 0; + +- newtp->ca_ops = &tcp_reno; ++ newtp->ca_ops = &tcp_init_congestion_ops; + + tcp_set_ca_state(newtp, TCP_CA_Open); + tcp_init_xmit_timers(newsk);