diff options
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 7547a6d238a2..a25e1d286b99 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
@@ -538,13 +538,6 @@ static struct ctl_table ipv4_table[] = { | |||
538 | .proc_handler = proc_dointvec | 538 | .proc_handler = proc_dointvec |
539 | }, | 539 | }, |
540 | { | 540 | { |
541 | .procname = "tcp_ecn", | ||
542 | .data = &sysctl_tcp_ecn, | ||
543 | .maxlen = sizeof(int), | ||
544 | .mode = 0644, | ||
545 | .proc_handler = proc_dointvec | ||
546 | }, | ||
547 | { | ||
548 | .procname = "tcp_dsack", | 541 | .procname = "tcp_dsack", |
549 | .data = &sysctl_tcp_dsack, | 542 | .data = &sysctl_tcp_dsack, |
550 | .maxlen = sizeof(int), | 543 | .maxlen = sizeof(int), |
@@ -850,6 +843,13 @@ static struct ctl_table ipv4_net_table[] = { | |||
850 | .proc_handler = ipv4_ping_group_range, | 843 | .proc_handler = ipv4_ping_group_range, |
851 | }, | 844 | }, |
852 | { | 845 | { |
846 | .procname = "tcp_ecn", | ||
847 | .data = &init_net.ipv4.sysctl_tcp_ecn, | ||
848 | .maxlen = sizeof(int), | ||
849 | .mode = 0644, | ||
850 | .proc_handler = proc_dointvec | ||
851 | }, | ||
852 | { | ||
853 | .procname = "tcp_mem", | 853 | .procname = "tcp_mem", |
854 | .maxlen = sizeof(init_net.ipv4.sysctl_tcp_mem), | 854 | .maxlen = sizeof(init_net.ipv4.sysctl_tcp_mem), |
855 | .mode = 0644, | 855 | .mode = 0644, |
@@ -882,6 +882,8 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) | |||
882 | &net->ipv4.sysctl_icmp_ratemask; | 882 | &net->ipv4.sysctl_icmp_ratemask; |
883 | table[6].data = | 883 | table[6].data = |
884 | &net->ipv4.sysctl_ping_group_range; | 884 | &net->ipv4.sysctl_ping_group_range; |
885 | table[7].data = | ||
886 | &net->ipv4.sysctl_tcp_ecn; | ||
885 | 887 | ||
886 | /* Don't export sysctls to unprivileged users */ | 888 | /* Don't export sysctls to unprivileged users */ |
887 | if (net->user_ns != &init_user_ns) | 889 | if (net->user_ns != &init_user_ns) |