diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-10 17:43:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:01:41 -0800 |
| commit | e186932b3d26bd975022a1e254407e95dddceae7 (patch) | |
| tree | aeac3f8dcb70df6eb09c8acbc8fb469ac9bc89fd /net | |
| parent | 441fc2a2393a9b9ffbacb97f4427cce743579411 (diff) | |
[NETNS]: Use the per-net ipv6_devconf(_all) in sysctl handlers
Actually the net->ipv6.devconf_all can be used in a few places,
but to keep the /proc/sys/net/ipv6/conf/ sysctls work consistently
in the namespace we should use the per-net devconf_all in the
sysctl "forwarding" handler.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/addrconf.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 9b96de3ba5e..cd90f9a6da3 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -456,7 +456,7 @@ static void dev_forward_change(struct inet6_dev *idev) } -static void addrconf_forward_change(struct net *net) +static void addrconf_forward_change(struct net *net, __s32 newf) { struct net_device *dev; struct inet6_dev *idev; @@ -466,8 +466,8 @@ static void addrconf_forward_change(struct net *net) rcu_read_lock(); idev = __in6_dev_get(dev); if (idev) { - int changed = (!idev->cnf.forwarding) ^ (!ipv6_devconf.forwarding); - idev->cnf.forwarding = ipv6_devconf.forwarding; + int changed = (!idev->cnf.forwarding) ^ (!newf); + idev->cnf.forwarding = newf; if (changed) dev_forward_change(idev); } @@ -484,9 +484,10 @@ static void addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old) if (p == &net->ipv6.devconf_dflt->forwarding) return; - if (p == &ipv6_devconf.forwarding) { - net->ipv6.devconf_dflt->forwarding = ipv6_devconf.forwarding; - addrconf_forward_change(net); + if (p == &net->ipv6.devconf_all->forwarding) { + __s32 newf = net->ipv6.devconf_all->forwarding; + net->ipv6.devconf_dflt->forwarding = newf; + addrconf_forward_change(net, newf); } else if ((!*p) ^ (!old)) dev_forward_change((struct inet6_dev *)table->extra1); |