AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[NETNS]: Use the per-net ipv6_devconf(_all) in sysctl handlers

Browse Source 
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>
This commit is contained in:
Pavel Emelyanov 2008-01-10 17:43:50 -08:00 committed by David S. Miller
parent 441fc2a239
commit e186932b3d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/ipv6/addrconf.c
View File

@ -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 net_device *dev;
struct inet6_dev *idev; struct inet6_dev *idev;
@ -466,8 +466,8 @@ static void addrconf_forward_change(struct net *net)
rcu_read_lock(); rcu_read_lock();
idev = __in6_dev_get(dev); idev = __in6_dev_get(dev);
if (idev) { if (idev) {
int changed = (!idev->cnf.forwarding) ^ (!ipv6_devconf.forwarding); int changed = (!idev->cnf.forwarding) ^ (!newf);
idev->cnf.forwarding = ipv6_devconf.forwarding; idev->cnf.forwarding = newf;
if (changed) if (changed)
dev_forward_change(idev); 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) if (p == &net->ipv6.devconf_dflt->forwarding)
return; return;
if (p == &ipv6_devconf.forwarding) { if (p == &net->ipv6.devconf_all->forwarding) {
net->ipv6.devconf_dflt->forwarding = ipv6_devconf.forwarding; __s32 newf = net->ipv6.devconf_all->forwarding;
addrconf_forward_change(net); net->ipv6.devconf_dflt->forwarding = newf;
addrconf_forward_change(net, newf);
} else if ((!*p) ^ (!old)) } else if ((!*p) ^ (!old))
dev_forward_change((struct inet6_dev *)table->extra1); dev_forward_change((struct inet6_dev *)table->extra1);