Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ab438fc authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[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: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6133fb1a

net/core/neighbour.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -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].procname = p_name;

	neigh_path[NEIGH_CTL_PATH_PROTO].ctl_name = p_id;

	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)

	if (!t->sysctl_header)

		goto free_procname;

		goto free_procname;