Commit 2f4520d3 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

ipv4: sysctl fixes 



net.ipv4.neigh should be a part of skeleton to avoid ordering problems

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30c2235c

net/ipv4/route.c

+20 −4
Original line number Diff line number Diff line
@@ -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