From 5ec0745e2949002d0a2d1b2dda7d5a1f44bf186a Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 31 Oct 2006 17:31:33 -0800
Subject: [PATCH] --- yaml --- r: 40610 b: refs/heads/master c:
 b1736a71404b3961f061c795a81210aa7f945fc0 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/net/ipv4/sysctl_net_ipv4.c | 7 -------
 trunk/net/ipv4/tcp_cong.c        | 8 ++++++++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 6ae8b7a4c2b9..ae8034e3a6fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d55b4c631e89a008e80b003e5aa4291d9ec800ac
+refs/heads/master: b1736a71404b3961f061c795a81210aa7f945fc0
diff --git a/trunk/net/ipv4/sysctl_net_ipv4.c b/trunk/net/ipv4/sysctl_net_ipv4.c
index e82a5be894b5..15061b314411 100644
--- a/trunk/net/ipv4/sysctl_net_ipv4.c
+++ b/trunk/net/ipv4/sysctl_net_ipv4.c
@@ -129,13 +129,6 @@ static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name,
 	return ret;
 }
 
-static int __init tcp_congestion_default(void)
-{
-	return tcp_set_default_congestion_control(CONFIG_DEFAULT_TCP_CONG);
-}
-
-late_initcall(tcp_congestion_default);
-
 ctl_table ipv4_table[] = {
         {
 		.ctl_name	= NET_IPV4_TCP_TIMESTAMPS,
diff --git a/trunk/net/ipv4/tcp_cong.c b/trunk/net/ipv4/tcp_cong.c
index af0aca1e6be6..1e2982f4acd4 100644
--- a/trunk/net/ipv4/tcp_cong.c
+++ b/trunk/net/ipv4/tcp_cong.c
@@ -131,6 +131,14 @@ int tcp_set_default_congestion_control(const char *name)
 	return ret;
 }
 
+/* Set default value from kernel configuration at bootup */
+static int __init tcp_congestion_default(void)
+{
+	return tcp_set_default_congestion_control(CONFIG_DEFAULT_TCP_CONG);
+}
+late_initcall(tcp_congestion_default);
+
+
 /* Get current default congestion control */
 void tcp_get_default_congestion_control(char *name)
 {