Commit b1736a71 authored Oct 31, 2006 by Stephen Hemminger Committed by David S. Miller Nov 01, 2006

[TCP]: Set default congestion control when no sysctl.



The setting of the default congestion control was buried in
the sysctl code so it would not be done properly if SYSCTL was
not enabled.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d55b4c63

net/ipv4/sysctl_net_ipv4.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -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,

net/ipv4/tcp_cong.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -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)
		{