net ipv4: Remove the unneeded registration of an empty net/ipv4/neigh

sysctl no longer requires explicit creation of directories.  The neigh
directory is always populated with at least a default entry so this
won't cause any user visible changes.

Delete the ipv4_path and the ipv4_skeleton these are no longer needed.

Directly register the ipv4_route_table.

And since I am an idiot remove the header definitions that I should
have removed in the previous patch.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 18 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 86866a4b537f..adf2105a6e85 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3344,23 +3344,6 @@ static ctl_table ipv4_route_table[] = {
         { }
 };
 
-static struct ctl_table empty[1];
-
-static struct ctl_table ipv4_skeleton[] =
-{
-        { .procname = "route", 
-          .mode = 0555, .child = ipv4_route_table},
-        { .procname = "neigh", 
-          .mode = 0555, .child = empty},
-        { }
-};
-
-static __net_initdata struct ctl_path ipv4_path[] = {
-        { .procname = "net", },
-        { .procname = "ipv4", },
-        { },
-};
-
 static struct ctl_table ipv4_route_flush_table[] = {
         {
                 .procname       = "flush",
@@ -3515,6 +3498,6 @@ int __init ip_rt_init(void)
  */
 void __init ip_static_sysctl_init(void)
 {
-        kmemleak_not_leak(register_net_sysctl_table(&init_net, ipv4_path, ipv4_skeleton));
+        register_net_sysctl(&init_net, "net/ipv4/route", ipv4_route_table);
 }
 #endif