diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
| commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
| tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /net/ipv6/addrconf.c | |
| parent | ffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff) | |
| parent | e93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff) | |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 79181819a24f..6bc85f7c31e3 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -494,8 +494,7 @@ static void addrconf_forward_change(struct net *net, __s32 newf) | |||
| 494 | struct net_device *dev; | 494 | struct net_device *dev; |
| 495 | struct inet6_dev *idev; | 495 | struct inet6_dev *idev; |
| 496 | 496 | ||
| 497 | rcu_read_lock(); | 497 | for_each_netdev(net, dev) { |
| 498 | for_each_netdev_rcu(net, dev) { | ||
| 499 | idev = __in6_dev_get(dev); | 498 | idev = __in6_dev_get(dev); |
| 500 | if (idev) { | 499 | if (idev) { |
| 501 | int changed = (!idev->cnf.forwarding) ^ (!newf); | 500 | int changed = (!idev->cnf.forwarding) ^ (!newf); |
| @@ -504,7 +503,6 @@ static void addrconf_forward_change(struct net *net, __s32 newf) | |||
| 504 | dev_forward_change(idev); | 503 | dev_forward_change(idev); |
| 505 | } | 504 | } |
| 506 | } | 505 | } |
| 507 | rcu_read_unlock(); | ||
| 508 | } | 506 | } |
| 509 | 507 | ||
| 510 | static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf) | 508 | static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf) |