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, 4 insertions, 10 deletions

diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c
index 84b5ffcb280f..517c6c9987ba 100644
--- a/net/rds/ib_sysctl.c
+++ b/net/rds/ib_sysctl.c
@@ -67,7 +67,6 @@ unsigned int rds_ib_sysctl_flow_control = 0;
 
 ctl_table rds_ib_sysctl_table[] = {
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_send_wr",
                 .data           = &rds_ib_sysctl_max_send_wr,
                 .maxlen         = sizeof(unsigned long),
@@ -77,7 +76,6 @@ ctl_table rds_ib_sysctl_table[] = {
                 .extra2         = &rds_ib_sysctl_max_wr_max,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_recv_wr",
                 .data           = &rds_ib_sysctl_max_recv_wr,
                 .maxlen         = sizeof(unsigned long),
@@ -87,7 +85,6 @@ ctl_table rds_ib_sysctl_table[] = {
                 .extra2         = &rds_ib_sysctl_max_wr_max,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_unsignaled_wr",
                 .data           = &rds_ib_sysctl_max_unsig_wrs,
                 .maxlen         = sizeof(unsigned long),
@@ -97,7 +94,6 @@ ctl_table rds_ib_sysctl_table[] = {
                 .extra2         = &rds_ib_sysctl_max_unsig_wr_max,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_unsignaled_bytes",
                 .data           = &rds_ib_sysctl_max_unsig_bytes,
                 .maxlen         = sizeof(unsigned long),
@@ -107,7 +103,6 @@ ctl_table rds_ib_sysctl_table[] = {
                 .extra2         = &rds_ib_sysctl_max_unsig_bytes_max,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_recv_allocation",
                 .data           = &rds_ib_sysctl_max_recv_allocation,
                 .maxlen         = sizeof(unsigned long),
@@ -115,20 +110,19 @@ ctl_table rds_ib_sysctl_table[] = {
                 .proc_handler   = &proc_doulongvec_minmax,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "flow_control",
                 .data           = &rds_ib_sysctl_flow_control,
                 .maxlen         = sizeof(rds_ib_sysctl_flow_control),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
         },
-        { .ctl_name = 0}
+        { }
 };
 
 static struct ctl_path rds_ib_sysctl_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "rds", .ctl_name = CTL_UNNUMBERED, },
-        { .procname = "ib", .ctl_name = CTL_UNNUMBERED, },
+        { .procname = "net", },
+        { .procname = "rds", },
+        { .procname = "ib", },
         { }
 };