diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-05 16:32:03 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-12 05:05:06 -0500 |
commit | f8572d8f2a2ba75408b97dc24ef47c83671795d7 (patch) | |
tree | 052506a457939fea00d138d3a982d778df34e14c /net/ipv4/netfilter/nf_conntrack_proto_icmp.c | |
parent | 86b1bc68e2f4244e4ea5db5458df9d19259fbb30 (diff) |
sysctl net: Remove unused binary sysctl code
Now that sys_sysctl is a compatiblity wrapper around /proc/sys
all sysctl strategy routines, and all ctl_name and strategy
entries in the sysctl tables are unused, and can be
revmoed.
In addition neigh_sysctl_register has been modified to no longer
take a strategy argument and it's callers have been modified not
to pass one.
Cc: "David Miller" <davem@davemloft.net>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: netdev@vger.kernel.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'net/ipv4/netfilter/nf_conntrack_proto_icmp.c')
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c index d71ba767734..9072058778b 100644 --- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c +++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c | |||
@@ -270,9 +270,7 @@ static struct ctl_table icmp_sysctl_table[] = { | |||
270 | .mode = 0644, | 270 | .mode = 0644, |
271 | .proc_handler = proc_dointvec_jiffies, | 271 | .proc_handler = proc_dointvec_jiffies, |
272 | }, | 272 | }, |
273 | { | 273 | { } |
274 | .ctl_name = 0 | ||
275 | } | ||
276 | }; | 274 | }; |
277 | #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT | 275 | #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT |
278 | static struct ctl_table icmp_compat_sysctl_table[] = { | 276 | static struct ctl_table icmp_compat_sysctl_table[] = { |
@@ -283,9 +281,7 @@ static struct ctl_table icmp_compat_sysctl_table[] = { | |||
283 | .mode = 0644, | 281 | .mode = 0644, |
284 | .proc_handler = proc_dointvec_jiffies, | 282 | .proc_handler = proc_dointvec_jiffies, |
285 | }, | 283 | }, |
286 | { | 284 | { } |
287 | .ctl_name = 0 | ||
288 | } | ||
289 | }; | 285 | }; |
290 | #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ | 286 | #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ |
291 | #endif /* CONFIG_SYSCTL */ | 287 | #endif /* CONFIG_SYSCTL */ |