From 40c0a29b621a038f23e0fc9156f0ee280cbd0cb0 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 25 Aug 2008 15:17:44 -0700
Subject: [PATCH] --- yaml --- r: 109119 b: refs/heads/master c:
 2f4520d35d89ca6c5cd129c38e3b11f0283b7d1b h: refs/heads/master i:   109117:
 622134075dbdd473d019e59ba513c031292ac848   109115:
 3de1ff858f35908405df78494e664455a8b5acc7   109111:
 25f81d9b21669bb241a10ebae174a35ed88f06ed   109103:
 f1564fcd6756ce2f1d83dcae44338de67a05f29b   109087:
 f95416e43e63b6accd41b4057113ee23523c1644   109055:
 d9ee509183f6070b7f9d39b764c18684a3c160fb v: v3

---
 [refs]                 |  2 +-
 trunk/net/ipv4/route.c | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e00a575c1e06..3f3e4edc4aee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30c2235cbc477d4629983d440cdc4f496fec9246
+refs/heads/master: 2f4520d35d89ca6c5cd129c38e3b11f0283b7d1b
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index cca921ea8550..e91bafeb32f4 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -3116,14 +3116,23 @@ static ctl_table ipv4_route_table[] = {
 	{ .ctl_name = 0 }
 };
 
-static __net_initdata struct ctl_path ipv4_route_path[] = {
+static struct ctl_table empty[1];
+
+static struct ctl_table ipv4_skeleton[] =
+{
+	{ .procname = "route", .ctl_name = NET_IPV4_ROUTE,
+	  .child = ipv4_route_table},
+	{ .procname = "neigh", .ctl_name = NET_IPV4_NEIGH,
+	  .child = empty},
+	{ }
+};
+
+static __net_initdata struct ctl_path ipv4_path[] = {
 	{ .procname = "net", .ctl_name = CTL_NET, },
 	{ .procname = "ipv4", .ctl_name = NET_IPV4, },
-	{ .procname = "route", .ctl_name = NET_IPV4_ROUTE, },
 	{ },
 };
 
-
 static struct ctl_table ipv4_route_flush_table[] = {
 	{
 		.ctl_name 	= NET_IPV4_ROUTE_FLUSH,
@@ -3136,6 +3145,13 @@ static struct ctl_table ipv4_route_flush_table[] = {
 	{ .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, },
+	{ },
+};
+
 static __net_init int sysctl_route_net_init(struct net *net)
 {
 	struct ctl_table *tbl;
@@ -3287,7 +3303,7 @@ int __init ip_rt_init(void)
  */
 void __init ip_static_sysctl_init(void)
 {
-	register_sysctl_paths(ipv4_route_path, ipv4_route_table);
+	register_sysctl_paths(ipv4_path, ipv4_skeleton);
 }
 #endif