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, 2 insertions, 13 deletions

diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index a5d3416522de..d2efd29f434e 100644
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -19,62 +19,51 @@ static struct ctl_table_header *x25_table_header;
 
 static struct ctl_table x25_table[] = {
         {
-                .ctl_name =     NET_X25_RESTART_REQUEST_TIMEOUT,
                 .procname =     "restart_request_timeout",
                 .data =         &sysctl_x25_restart_request_timeout,
                 .maxlen =       sizeof(int),
                 .mode =         0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy =     sysctl_intvec,
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
         {
-                .ctl_name =     NET_X25_CALL_REQUEST_TIMEOUT,
                 .procname =     "call_request_timeout",
                 .data =         &sysctl_x25_call_request_timeout,
                 .maxlen =       sizeof(int),
                 .mode =         0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy =     sysctl_intvec,
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
         {
-                .ctl_name =     NET_X25_RESET_REQUEST_TIMEOUT,
                 .procname =     "reset_request_timeout",
                 .data =         &sysctl_x25_reset_request_timeout,
                 .maxlen =       sizeof(int),
                 .mode =         0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy =     sysctl_intvec,
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
         {
-                .ctl_name =     NET_X25_CLEAR_REQUEST_TIMEOUT,
                 .procname =     "clear_request_timeout",
                 .data =         &sysctl_x25_clear_request_timeout,
                 .maxlen =       sizeof(int),
                 .mode =         0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy =     sysctl_intvec,
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
         {
-                .ctl_name =     NET_X25_ACK_HOLD_BACK_TIMEOUT,
                 .procname =     "acknowledgement_hold_back_timeout",
                 .data =         &sysctl_x25_ack_holdback_timeout,
                 .maxlen =       sizeof(int),
                 .mode =         0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy =     sysctl_intvec,
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
         {
-                .ctl_name =     NET_X25_FORWARD,
                 .procname =     "x25_forward",
                 .data =         &sysctl_x25_forward,
                 .maxlen =       sizeof(int),
@@ -85,8 +74,8 @@ static struct ctl_table x25_table[] = {
 };
 
 static struct ctl_path x25_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "x25", .ctl_name = NET_X25, },
+        { .procname = "net", },
+        { .procname = "x25", },
         { }
 };