diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 | ||||
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c index 11fedc73049c..adcbaf6d4299 100644 --- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c +++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c | |||
@@ -281,7 +281,6 @@ static int icmp_nlattr_to_tuple(struct nlattr *tb[], | |||
281 | static struct ctl_table_header *icmp_sysctl_header; | 281 | static struct ctl_table_header *icmp_sysctl_header; |
282 | static struct ctl_table icmp_sysctl_table[] = { | 282 | static struct ctl_table icmp_sysctl_table[] = { |
283 | { | 283 | { |
284 | .ctl_name = NET_NF_CONNTRACK_ICMP_TIMEOUT, | ||
285 | .procname = "nf_conntrack_icmp_timeout", | 284 | .procname = "nf_conntrack_icmp_timeout", |
286 | .data = &nf_ct_icmp_timeout, | 285 | .data = &nf_ct_icmp_timeout, |
287 | .maxlen = sizeof(unsigned int), | 286 | .maxlen = sizeof(unsigned int), |
@@ -295,7 +294,6 @@ static struct ctl_table icmp_sysctl_table[] = { | |||
295 | #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT | 294 | #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT |
296 | static struct ctl_table icmp_compat_sysctl_table[] = { | 295 | static struct ctl_table icmp_compat_sysctl_table[] = { |
297 | { | 296 | { |
298 | .ctl_name = NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT, | ||
299 | .procname = "ip_conntrack_icmp_timeout", | 297 | .procname = "ip_conntrack_icmp_timeout", |
300 | .data = &nf_ct_icmp_timeout, | 298 | .data = &nf_ct_icmp_timeout, |
301 | .maxlen = sizeof(unsigned int), | 299 | .maxlen = sizeof(unsigned int), |
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index c98ef16effd2..c78acc1a7f11 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
@@ -740,7 +740,6 @@ ctl_table ipv4_table[] = { | |||
740 | .strategy = &sysctl_jiffies | 740 | .strategy = &sysctl_jiffies |
741 | }, | 741 | }, |
742 | { | 742 | { |
743 | .ctl_name = NET_IPV4_IPFRAG_MAX_DIST, | ||
744 | .procname = "ipfrag_max_dist", | 743 | .procname = "ipfrag_max_dist", |
745 | .data = &sysctl_ipfrag_max_dist, | 744 | .data = &sysctl_ipfrag_max_dist, |
746 | .maxlen = sizeof(int), | 745 | .maxlen = sizeof(int), |
@@ -865,7 +864,6 @@ ctl_table ipv4_table[] = { | |||
865 | }, | 864 | }, |
866 | #endif /* CONFIG_NETLABEL */ | 865 | #endif /* CONFIG_NETLABEL */ |
867 | { | 866 | { |
868 | .ctl_name = NET_TCP_AVAIL_CONG_CONTROL, | ||
869 | .procname = "tcp_available_congestion_control", | 867 | .procname = "tcp_available_congestion_control", |
870 | .maxlen = TCP_CA_BUF_MAX, | 868 | .maxlen = TCP_CA_BUF_MAX, |
871 | .mode = 0444, | 869 | .mode = 0444, |