From: Denis V. Lunev Date: Fri, 29 Feb 2008 04:48:01 +0000 (-0800) Subject: [NETNS]: Register neighbour table parameters in the correct namespace. X-Git-Tag: v2.6.26-rc1~1138^2~568 X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4ab438fcd7373da9e559576e418e890b7cfd94f4;p=linux-2.6-omap-h63xx.git [NETNS]: Register neighbour table parameters in the correct namespace. neigh_sysctl_register should register sysctl entries inside correct namespace to avoid naming conflict. Typical example is a loopback. Entries for it present in all namespaces. Required to make inetdev_event working. Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller --- diff --git a/net/core/neighbour.c b/net/core/neighbour.c index aef01533dfb..be8b264b29b 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -2741,7 +2741,8 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, neigh_path[NEIGH_CTL_PATH_PROTO].procname = p_name; neigh_path[NEIGH_CTL_PATH_PROTO].ctl_name = p_id; - t->sysctl_header = register_sysctl_paths(neigh_path, t->neigh_vars); + t->sysctl_header = + register_net_sysctl_table(p->net, neigh_path, t->neigh_vars); if (!t->sysctl_header) goto free_procname;