Add tcp congestion control fix from shemminger

diff --git a/queue/series b/queue/series
index baa49f8f73de1e9eca718a2eb06e2f00f6380111..b45bf51377e61b8cd8c16cacc6216edd082a5e4f 100644 (file)
--- 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 (file)
index 0000000..8f23515
--- /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 <shemminger@osdl.org>
+To: "David S. Miller" <davem@davemloft.net>
+Cc: netdev@vger.kernel.org, stable@kernel.org, Joel Sing <joel@ionix.com.au>
+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 <shemminger@osdl.org>
+Acked-by: "David S. Miller" <davem@davemloft.net>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+ 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);