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

Commit 441fc2a2 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NETNS]: Use the per-net ipv6_devconf_dflt 



All its users are in net/ipv6/addrconf.c's sysctl handlers.
Since they already have the struct net to get from, the
per-net ipv6_devconf_dflt can already be used.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0da5a48

net/ipv6/addrconf.c

+3 −3
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) 


	rwlock_init(&ndev->lock);

	ndev->dev = dev;

	memcpy(&ndev->cnf, &ipv6_devconf_dflt, sizeof(ndev->cnf));

	memcpy(&ndev->cnf, dev->nd_net->ipv6.devconf_dflt, sizeof(ndev->cnf));

	ndev->cnf.mtu6 = dev->mtu;

	ndev->cnf.sysctl = NULL;

	ndev->nd_parms = neigh_parms_alloc(dev, &nd_tbl);
@@ -481,11 +481,11 @@ static void addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old) 
	struct net *net;



	net = (struct net *)table->extra2;

	if (p == &ipv6_devconf_dflt.forwarding)

	if (p == &net->ipv6.devconf_dflt->forwarding)

		return;



	if (p == &ipv6_devconf.forwarding) {

		ipv6_devconf_dflt.forwarding = ipv6_devconf.forwarding;

		net->ipv6.devconf_dflt->forwarding = ipv6_devconf.forwarding;

		addrconf_forward_change(net);

	} else if ((!*p) ^ (!old))

		dev_forward_change((struct inet6_dev *)table->extra1);