1 files changed, 9 insertions, 64 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 5b1050a5d874..0d9f584a3811 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3056,23 +3056,6 @@ static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write,
         return -EINVAL;
 }
 
-static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table,
-                                                void __user *oldval,
-                                                size_t __user *oldlenp,
-                                                void __user *newval,
-                                                size_t newlen)
-{
-        int delay;
-        struct net *net;
-        if (newlen != sizeof(int))
-                return -EINVAL;
-        if (get_user(delay, (int __user *)newval))
-                return -EFAULT;
-        net = (struct net *)table->extra1;
-        rt_cache_flush(net, delay);
-        return 0;
-}
-
 static void rt_secret_reschedule(int old)
 {
         struct net *net;
@@ -3117,23 +3100,8 @@ static int ipv4_sysctl_rt_secret_interval(ctl_table *ctl, int write,
         return ret;
 }
 
-static int ipv4_sysctl_rt_secret_interval_strategy(ctl_table *table,
-                                                   void __user *oldval,
-                                                   size_t __user *oldlenp,
-                                                   void __user *newval,
-                                                   size_t newlen)
-{
-        int old = ip_rt_secret_interval;
-        int ret = sysctl_jiffies(table, oldval, oldlenp, newval, newlen);
-
-        rt_secret_reschedule(old);
-
-        return ret;
-}
-
 static ctl_table ipv4_route_table[] = {
         {
-                .ctl_name       = NET_IPV4_ROUTE_GC_THRESH,
                 .procname       = "gc_thresh",
                 .data           = &ipv4_dst_ops.gc_thresh,
                 .maxlen         = sizeof(int),
@@ -3141,7 +3109,6 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_MAX_SIZE,
                 .procname       = "max_size",
                 .data           = &ip_rt_max_size,
                 .maxlen         = sizeof(int),
@@ -3151,43 +3118,34 @@ static ctl_table ipv4_route_table[] = {
         {
                 /*  Deprecated. Use gc_min_interval_ms */
 
-                .ctl_name       = NET_IPV4_ROUTE_GC_MIN_INTERVAL,
                 .procname       = "gc_min_interval",
                 .data           = &ip_rt_gc_min_interval,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
-                .strategy       = sysctl_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS,
                 .procname       = "gc_min_interval_ms",
                 .data           = &ip_rt_gc_min_interval,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_ms_jiffies,
-                .strategy       = sysctl_ms_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_GC_TIMEOUT,
                 .procname       = "gc_timeout",
                 .data           = &ip_rt_gc_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
-                .strategy       = sysctl_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_GC_INTERVAL,
                 .procname       = "gc_interval",
                 .data           = &ip_rt_gc_interval,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
-                .strategy       = sysctl_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_REDIRECT_LOAD,
                 .procname       = "redirect_load",
                 .data           = &ip_rt_redirect_load,
                 .maxlen         = sizeof(int),
@@ -3195,7 +3153,6 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_REDIRECT_NUMBER,
                 .procname       = "redirect_number",
                 .data           = &ip_rt_redirect_number,
                 .maxlen         = sizeof(int),
@@ -3203,7 +3160,6 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_REDIRECT_SILENCE,
                 .procname       = "redirect_silence",
                 .data           = &ip_rt_redirect_silence,
                 .maxlen         = sizeof(int),
@@ -3211,7 +3167,6 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_ERROR_COST,
                 .procname       = "error_cost",
                 .data           = &ip_rt_error_cost,
                 .maxlen         = sizeof(int),
@@ -3219,7 +3174,6 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_ERROR_BURST,
                 .procname       = "error_burst",
                 .data           = &ip_rt_error_burst,
                 .maxlen         = sizeof(int),
@@ -3227,7 +3181,6 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_GC_ELASTICITY,
                 .procname       = "gc_elasticity",
                 .data           = &ip_rt_gc_elasticity,
                 .maxlen         = sizeof(int),
@@ -3235,16 +3188,13 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_MTU_EXPIRES,
                 .procname       = "mtu_expires",
                 .data           = &ip_rt_mtu_expires,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
-                .strategy       = sysctl_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_MIN_PMTU,
                 .procname       = "min_pmtu",
                 .data           = &ip_rt_min_pmtu,
                 .maxlen         = sizeof(int),
@@ -3252,7 +3202,6 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_MIN_ADVMSS,
                 .procname       = "min_adv_mss",
                 .data           = &ip_rt_min_advmss,
                 .maxlen         = sizeof(int),
@@ -3260,50 +3209,46 @@ static ctl_table ipv4_route_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_IPV4_ROUTE_SECRET_INTERVAL,
                 .procname       = "secret_interval",
                 .data           = &ip_rt_secret_interval,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = ipv4_sysctl_rt_secret_interval,
-                .strategy       = ipv4_sysctl_rt_secret_interval_strategy,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_table empty[1];
 
 static struct ctl_table ipv4_skeleton[] =
 {
-        { .procname = "route", .ctl_name = NET_IPV4_ROUTE,
+        { .procname = "route", 
           .mode = 0555, .child = ipv4_route_table},
-        { .procname = "neigh", .ctl_name = NET_IPV4_NEIGH,
+        { .procname = "neigh", 
           .mode = 0555, .child = empty},
         { }
 };
 
 static __net_initdata struct ctl_path ipv4_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "ipv4", .ctl_name = NET_IPV4, },
+        { .procname = "net", },
+        { .procname = "ipv4", },
         { },
 };
 
 static struct ctl_table ipv4_route_flush_table[] = {
         {
-                .ctl_name       = NET_IPV4_ROUTE_FLUSH,
                 .procname       = "flush",
                 .maxlen         = sizeof(int),
                 .mode           = 0200,
                 .proc_handler   = ipv4_sysctl_rtcache_flush,
-                .strategy       = ipv4_sysctl_rtcache_flush_strategy,
         },
-        { .ctl_name = 0 },
+        { },
 };
 
 static __net_initdata struct ctl_path ipv4_route_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "ipv4", .ctl_name = NET_IPV4, },
-        { .procname = "route", .ctl_name = NET_IPV4_ROUTE, },
+        { .procname = "net", },
+        { .procname = "ipv4", },
+        { .procname = "route", },
         { },
 };