summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-02-29 07:48:01 +0300
committerDavid S. Miller <davem@davemloft.net>2008-02-29 07:48:01 +0300
commit4ab438fcd7373da9e559576e418e890b7cfd94f4 (patch)
tree77014a7b9b3229d021865ee1c6c18d9e242d7edc /net
parent6133fb1aa137b35a8fa91ec17977ebf6a41456ec (diff)
downloadlinux-4ab438fcd7373da9e559576e418e890b7cfd94f4.tar.xz
[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 <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/neighbour.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index aef01533dfb6..be8b264b29bf 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;