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>

1 files changed, 3 insertions, 27 deletions

diff --git a/net/netrom/sysctl_net_netrom.c b/net/netrom/sysctl_net_netrom.c
index 7b49591fe87c..1e0fa9e57aac 100644
--- a/net/netrom/sysctl_net_netrom.c
+++ b/net/netrom/sysctl_net_netrom.c
@@ -36,143 +36,119 @@ static struct ctl_table_header *nr_table_header;
 
 static ctl_table nr_table[] = {
         {
-                .ctl_name       = NET_NETROM_DEFAULT_PATH_QUALITY,
                 .procname       = "default_path_quality",
                 .data           = &sysctl_netrom_default_path_quality,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_quality,
                 .extra2         = &max_quality
         },
         {
-                .ctl_name       = NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER,
                 .procname       = "obsolescence_count_initialiser",
                 .data           = &sysctl_netrom_obsolescence_count_initialiser,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_obs,
                 .extra2         = &max_obs
         },
         {
-                .ctl_name       = NET_NETROM_NETWORK_TTL_INITIALISER,
                 .procname       = "network_ttl_initialiser",
                 .data           = &sysctl_netrom_network_ttl_initialiser,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_ttl,
                 .extra2         = &max_ttl
         },
         {
-                .ctl_name       = NET_NETROM_TRANSPORT_TIMEOUT,
                 .procname       = "transport_timeout",
                 .data           = &sysctl_netrom_transport_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_t1,
                 .extra2         = &max_t1
         },
         {
-                .ctl_name       = NET_NETROM_TRANSPORT_MAXIMUM_TRIES,
                 .procname       = "transport_maximum_tries",
                 .data           = &sysctl_netrom_transport_maximum_tries,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_n2,
                 .extra2         = &max_n2
         },
         {
-                .ctl_name       = NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY,
                 .procname       = "transport_acknowledge_delay",
                 .data           = &sysctl_netrom_transport_acknowledge_delay,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_t2,
                 .extra2         = &max_t2
         },
         {
-                .ctl_name       = NET_NETROM_TRANSPORT_BUSY_DELAY,
                 .procname       = "transport_busy_delay",
                 .data           = &sysctl_netrom_transport_busy_delay,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_t4,
                 .extra2         = &max_t4
         },
         {
-                .ctl_name       = NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE,
                 .procname       = "transport_requested_window_size",
                 .data           = &sysctl_netrom_transport_requested_window_size,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_window,
                 .extra2         = &max_window
         },
         {
-                .ctl_name       = NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT,
                 .procname       = "transport_no_activity_timeout",
                 .data           = &sysctl_netrom_transport_no_activity_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_idle,
                 .extra2         = &max_idle
         },
         {
-                .ctl_name       = NET_NETROM_ROUTING_CONTROL,
                 .procname       = "routing_control",
                 .data           = &sysctl_netrom_routing_control,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_route,
                 .extra2         = &max_route
         },
         {
-                .ctl_name       = NET_NETROM_LINK_FAILS_COUNT,
                 .procname       = "link_fails_count",
                 .data           = &sysctl_netrom_link_fails_count,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_fails,
                 .extra2         = &max_fails
         },
         {
-                .ctl_name       = NET_NETROM_RESET,
                 .procname       = "reset",
                 .data           = &sysctl_netrom_reset_circuit,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_reset,
                 .extra2         = &max_reset
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_path nr_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "netrom", .ctl_name = NET_NETROM, },
+        { .procname = "net", },
+        { .procname = "netrom", },
         { }
 };