[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: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 3ad081e9366b8253ee92c260fea72299b4e1cfe3..9b96de3ba5eb334f649040f8e6a8ca16968fc827 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -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);