1 files changed, 7 insertions, 13 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 918648409612..024bba30de21 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -481,9 +481,8 @@ static void addrconf_forward_change(struct net *net, __s32 newf)
         struct net_device *dev;
         struct inet6_dev *idev;
 
-        read_lock(&dev_base_lock);
-        for_each_netdev(net, dev) {
-                rcu_read_lock();
+        rcu_read_lock();
+        for_each_netdev_rcu(net, dev) {
                 idev = __in6_dev_get(dev);
                 if (idev) {
                         int changed = (!idev->cnf.forwarding) ^ (!newf);
@@ -491,9 +490,8 @@ static void addrconf_forward_change(struct net *net, __s32 newf)
                         if (changed)
                                 dev_forward_change(idev);
                 }
-                rcu_read_unlock();
         }
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
 }
 
 static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
@@ -1137,10 +1135,9 @@ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
         hiscore->rule = -1;
         hiscore->ifa = NULL;
 
-        read_lock(&dev_base_lock);
         rcu_read_lock();
 
-        for_each_netdev(net, dev) {
+        for_each_netdev_rcu(net, dev) {
                 struct inet6_dev *idev;
 
                 /* Candidate Source Address (section 4)
@@ -1235,7 +1232,6 @@ try_nextdev:
                 read_unlock_bh(&idev->lock);
         }
         rcu_read_unlock();
-        read_unlock(&dev_base_lock);
 
         if (!hiscore->ifa)
                 return -EADDRNOTAVAIL;
@@ -4052,9 +4048,8 @@ static void addrconf_disable_change(struct net *net, __s32 newf)
         struct net_device *dev;
         struct inet6_dev *idev;
 
-        read_lock(&dev_base_lock);
-        for_each_netdev(net, dev) {
-                rcu_read_lock();
+        rcu_read_lock();
+        for_each_netdev_rcu(net, dev) {
                 idev = __in6_dev_get(dev);
                 if (idev) {
                         int changed = (!idev->cnf.disable_ipv6) ^ (!newf);
@@ -4062,9 +4057,8 @@ static void addrconf_disable_change(struct net *net, __s32 newf)
                         if (changed)
                                 dev_disable_change(idev);
                 }
-                rcu_read_unlock();
         }
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
 }
 
 static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int old)