[PATCH 51/69] sysctl: remove .child from net/ipv4/route and net/ipv4/neigh tables

Lucian Adrian Grijincu
2011-05-01T01:39:29Z

net/ipv4/route.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index c1acf69..6bc621b 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3146,18 +3146,10 @@ 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[] = {
+static __net_initdata struct ctl_path ipv4_neigh_path[] = {
{ .procname = "net", },
{ .procname = "ipv4", },
+ { .procname = "neigh", },
{ },
};

@@ -3310,6 +3302,7 @@ int __init ip_rt_init(void)
*/
void __init ip_static_sysctl_init(void)
{
- register_sysctl_paths(ipv4_path, ipv4_skeleton);
+ register_sysctl_paths(ipv4_route_path, ipv4_route_table);
+ register_sysctl_paths(ipv4_neigh_path, empty);
}
#endif
--
1.7.5.134.g1c08b