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 | |
| 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')
60 files changed, 161 insertions, 1127 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index e874447ad14..44acce47fcd 100644 --- a/net/802/tr.c +++ b/net/802/tr.c | |||
| @@ -635,19 +635,18 @@ struct net_device *alloc_trdev(int sizeof_priv) | |||
| 635 | #ifdef CONFIG_SYSCTL | 635 | #ifdef CONFIG_SYSCTL |
| 636 | static struct ctl_table tr_table[] = { | 636 | static struct ctl_table tr_table[] = { |
| 637 | { | 637 | { |
| 638 | .ctl_name = NET_TR_RIF_TIMEOUT, | ||
| 639 | .procname = "rif_timeout", | 638 | .procname = "rif_timeout", |
| 640 | .data = &sysctl_tr_rif_timeout, | 639 | .data = &sysctl_tr_rif_timeout, |
| 641 | .maxlen = sizeof(int), | 640 | .maxlen = sizeof(int), |
| 642 | .mode = 0644, | 641 | .mode = 0644, |
| 643 | .proc_handler = proc_dointvec | 642 | .proc_handler = proc_dointvec |
| 644 | }, | 643 | }, |
| 645 | { 0 }, | 644 | { }, |
| 646 | }; | 645 | }; |
| 647 | 646 | ||
| 648 | static __initdata struct ctl_path tr_path[] = { | 647 | static __initdata struct ctl_path tr_path[] = { |
| 649 | { .procname = "net", .ctl_name = CTL_NET, }, | 648 | { .procname = "net", }, |
| 650 | { .procname = "token-ring", .ctl_name = NET_TR, }, | 649 | { .procname = "token-ring", }, |
| 651 | { } | 650 | { } |
| 652 | }; | 651 | }; |
| 653 | #endif | 652 | #endif |
diff --git a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c index 8d237b15183..04e9c0da7aa 100644 --- a/net/appletalk/sysctl_net_atalk.c +++ b/net/appletalk/sysctl_net_atalk.c | |||
| @@ -12,25 +12,20 @@ | |||
| 12 | 12 | ||
| 13 | static struct ctl_table atalk_table[] = { | 13 | static struct ctl_table atalk_table[] = { |
| 14 | { | 14 | { |
| 15 | .ctl_name = NET_ATALK_AARP_EXPIRY_TIME, | ||
| 16 | .procname = "aarp-expiry-time", | 15 | .procname = "aarp-expiry-time", |
| 17 | .data = &sysctl_aarp_expiry_time, | 16 | .data = &sysctl_aarp_expiry_time, |
| 18 | .maxlen = sizeof(int), | 17 | .maxlen = sizeof(int), |
| 19 | .mode = 0644, | 18 | .mode = 0644, |
| 20 | .proc_handler = proc_dointvec_jiffies, | 19 | .proc_handler = proc_dointvec_jiffies, |
| 21 | .strategy = sysctl_jiffies, | ||
| 22 | }, | 20 | }, |
| 23 | { | 21 | { |
| 24 | .ctl_name = NET_ATALK_AARP_TICK_TIME, | ||
| 25 | .procname = "aarp-tick-time", | 22 | .procname = "aarp-tick-time", |
| 26 | .data = &sysctl_aarp_tick_time, | 23 | .data = &sysctl_aarp_tick_time, |
| 27 | .maxlen = sizeof(int), | 24 | .maxlen = sizeof(int), |
| 28 | .mode = 0644, | 25 | .mode = 0644, |
| 29 | .proc_handler = proc_dointvec_jiffies, | 26 | .proc_handler = proc_dointvec_jiffies, |
| 30 | .strategy = sysctl_jiffies, | ||
| 31 | }, | 27 | }, |
| 32 | { | 28 | { |
| 33 | .ctl_name = NET_ATALK_AARP_RETRANSMIT_LIMIT, | ||
| 34 | .procname = "aarp-retransmit-limit", | 29 | .procname = "aarp-retransmit-limit", |
| 35 | .data = &sysctl_aarp_retransmit_limit, | 30 | .data = &sysctl_aarp_retransmit_limit, |
| 36 | .maxlen = sizeof(int), | 31 | .maxlen = sizeof(int), |
| @@ -38,20 +33,18 @@ static struct ctl_table atalk_table[] = { | |||
| 38 | .proc_handler = proc_dointvec, | 33 | .proc_handler = proc_dointvec, |
| 39 | }, | 34 | }, |
| 40 | { | 35 | { |
| 41 | .ctl_name = NET_ATALK_AARP_RESOLVE_TIME, | ||
| 42 | .procname = "aarp-resolve-time", | 36 | .procname = "aarp-resolve-time", |
| 43 | .data = &sysctl_aarp_resolve_time, | 37 | .data = &sysctl_aarp_resolve_time, |
| 44 | .maxlen = sizeof(int), | 38 | .maxlen = sizeof(int), |
| 45 | .mode = 0644, | 39 | .mode = 0644, |
| 46 | .proc_handler = proc_dointvec_jiffies, | 40 | .proc_handler = proc_dointvec_jiffies, |
| 47 | .strategy = sysctl_jiffies, | ||
| 48 | }, | 41 | }, |
| 49 | { 0 }, | 42 | { }, |
| 50 | }; | 43 | }; |
| 51 | 44 | ||
| 52 | static struct ctl_path atalk_path[] = { | 45 | static struct ctl_path atalk_path[] = { |
| 53 | { .procname = "net", .ctl_name = CTL_NET, }, | 46 | { .procname = "net", }, |
| 54 | { .procname = "appletalk", .ctl_name = NET_ATALK, }, | 47 | { .procname = "appletalk", }, |
| 55 | { } | 48 | { } |
| 56 | }; | 49 | }; |
| 57 | 50 | ||
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c index 62ee3fb3473..5159be6b262 100644 --- a/net/ax25/sysctl_net_ax25.c +++ b/net/ax25/sysctl_net_ax25.c | |||
| @@ -34,156 +34,128 @@ static ctl_table *ax25_table; | |||
| 34 | static int ax25_table_size; | 34 | static int ax25_table_size; |
| 35 | 35 | ||
| 36 | static struct ctl_path ax25_path[] = { | 36 | static struct ctl_path ax25_path[] = { |
| 37 | { .procname = "net", .ctl_name = CTL_NET, }, | 37 | { .procname = "net", }, |
| 38 | { .procname = "ax25", .ctl_name = NET_AX25, }, | 38 | { .procname = "ax25", }, |
| 39 | { } | 39 | { } |
