mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-21 03:43:03 +00:00
[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>
This commit is contained in:
parent
e0da5a480c
commit
441fc2a239
|
@ -334,7 +334,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
|
||||||
|
|
||||||
rwlock_init(&ndev->lock);
|
rwlock_init(&ndev->lock);
|
||||||
ndev->dev = dev;
|
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.mtu6 = dev->mtu;
|
||||||
ndev->cnf.sysctl = NULL;
|
ndev->cnf.sysctl = NULL;
|
||||||
ndev->nd_parms = neigh_parms_alloc(dev, &nd_tbl);
|
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;
|
struct net *net;
|
||||||
|
|
||||||
net = (struct net *)table->extra2;
|
net = (struct net *)table->extra2;
|
||||||
if (p == &ipv6_devconf_dflt.forwarding)
|
if (p == &net->ipv6.devconf_dflt->forwarding)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (p == &ipv6_devconf.forwarding) {
|
if (p == &ipv6_devconf.forwarding) {
|
||||||
ipv6_devconf_dflt.forwarding = ipv6_devconf.forwarding;
|
net->ipv6.devconf_dflt->forwarding = ipv6_devconf.forwarding;
|
||||||
addrconf_forward_change(net);
|
addrconf_forward_change(net);
|
||||||
} else if ((!*p) ^ (!old))
|
} else if ((!*p) ^ (!old))
|
||||||
dev_forward_change((struct inet6_dev *)table->extra1);
|
dev_forward_change((struct inet6_dev *)table->extra1);
|
||||||
|
|
Loading…
Reference in a new issue