diff --git a/[refs] b/[refs] index 82a6a7e1ed4e..66a91dbfa3f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6133fb1aa137b35a8fa91ec17977ebf6a41456ec +refs/heads/master: 4ab438fcd7373da9e559576e418e890b7cfd94f4 diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c index aef01533dfb6..be8b264b29bf 100644 --- a/trunk/net/core/neighbour.c +++ b/trunk/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;