From b34045f48fa4ccac8fdd6f80ee6b243a79f34890 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 14 Aug 2012 08:54:51 +0000 Subject: [PATCH] --- yaml --- r: 321989 b: refs/heads/master c: 4acd4945cd1e1f92b20d14e349c6c6a52acbd42d h: refs/heads/master i: 321987: 8cd40f3c801113db138aec1ec890921c535a2d85 v: v3 --- [refs] | 2 +- trunk/net/ipv6/addrconf.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0aa10ee8162b..4aef43577451 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 499b95f6b324ec49e8ff50000d47877445b8590a +refs/heads/master: 4acd4945cd1e1f92b20d14e349c6c6a52acbd42d diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index 79181819a24f..6bc85f7c31e3 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/net/ipv6/addrconf.c @@ -494,8 +494,7 @@ static void addrconf_forward_change(struct net *net, __s32 newf) struct net_device *dev; struct inet6_dev *idev; - rcu_read_lock(); - for_each_netdev_rcu(net, dev) { + for_each_netdev(net, dev) { idev = __in6_dev_get(dev); if (idev) { int changed = (!idev->cnf.forwarding) ^ (!newf); @@ -504,7 +503,6 @@ static void addrconf_forward_change(struct net *net, __s32 newf) dev_forward_change(idev); } } - rcu_read_unlock(); } static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)