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/ipv6/reassembly.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/ipv6/reassembly.c')
-rw-r--r-- | net/ipv6/reassembly.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index da5bd0ed83df..2499e9712031 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -636,7 +636,6 @@ static const struct inet6_protocol frag_protocol = | |||
636 | #ifdef CONFIG_SYSCTL | 636 | #ifdef CONFIG_SYSCTL |
637 | static struct ctl_table ip6_frags_ns_ctl_table[] = { | 637 | static struct ctl_table ip6_frags_ns_ctl_table[] = { |
638 | { | 638 | { |
639 | .ctl_name = NET_IPV6_IP6FRAG_HIGH_THRESH, | ||
640 | .procname = "ip6frag_high_thresh", | 639 | .procname = "ip6frag_high_thresh", |
641 | .data = &init_net.ipv6.frags.high_thresh, | 640 | .data = &init_net.ipv6.frags.high_thresh, |
642 | .maxlen = sizeof(int), | 641 | .maxlen = sizeof(int), |
@@ -644,7 +643,6 @@ static struct ctl_table ip6_frags_ns_ctl_table[] = { | |||
644 | .proc_handler = proc_dointvec | 643 | .proc_handler = proc_dointvec |
645 | }, | 644 | }, |
646 | { | 645 | { |
647 | .ctl_name = NET_IPV6_IP6FRAG_LOW_THRESH, | ||
648 | .procname = "ip6frag_low_thresh", | 646 | .procname = "ip6frag_low_thresh", |
649 | .data = &init_net.ipv6.frags.low_thresh, | 647 | .data = &init_net.ipv6.frags.low_thresh, |
650 | .maxlen = sizeof(int), | 648 | .maxlen = sizeof(int), |
@@ -652,26 +650,22 @@ static struct ctl_table ip6_frags_ns_ctl_table[] = { | |||
652 | .proc_handler = proc_dointvec | 650 | .proc_handler = proc_dointvec |
653 | }, | 651 | }, |
654 | { | 652 | { |
655 | .ctl_name = NET_IPV6_IP6FRAG_TIME, | ||
656 | .procname = "ip6frag_time", | 653 | .procname = "ip6frag_time", |
657 | .data = &init_net.ipv6.frags.timeout, | 654 | .data = &init_net.ipv6.frags.timeout, |
658 | .maxlen = sizeof(int), | 655 | .maxlen = sizeof(int), |
659 | .mode = 0644, | 656 | .mode = 0644, |
660 | .proc_handler = proc_dointvec_jiffies, | 657 | .proc_handler = proc_dointvec_jiffies, |
661 | .strategy = sysctl_jiffies, | ||
662 | }, | 658 | }, |
663 | { } | 659 | { } |
664 | }; | 660 | }; |
665 | 661 | ||
666 | static struct ctl_table ip6_frags_ctl_table[] = { | 662 | static struct ctl_table ip6_frags_ctl_table[] = { |
667 | { | 663 | { |
668 | .ctl_name = NET_IPV6_IP6FRAG_SECRET_INTERVAL, | ||
669 | .procname = "ip6frag_secret_interval", | 664 | .procname = "ip6frag_secret_interval", |
670 | .data = &ip6_frags.secret_interval, | 665 | .data = &ip6_frags.secret_interval, |
671 | .maxlen = sizeof(int), | 666 | .maxlen = sizeof(int), |
672 | .mode = 0644, | 667 | .mode = 0644, |
673 | .proc_handler = proc_dointvec_jiffies, | 668 | .proc_handler = proc_dointvec_jiffies, |
674 | .strategy = sysctl_jiffies | ||
675 | }, | 669 | }, |
676 | { } | 670 | { } |
677 | }; | 671 | }; |