diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /net/ipv6/addrconf.c | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
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) |