3 files changed, 6 insertions, 5 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 690573bbf012..849deaf14108 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -475,11 +475,9 @@ void __exit br_cleanup_bridges(void)
         struct net_device *dev, *nxt;
 
         rtnl_lock();
-        for (dev = dev_base; dev; dev = nxt) {
-                nxt = dev->next;
+        for_each_netdev_safe(dev, nxt)
                 if (dev->priv_flags & IFF_EBRIDGE)
                         del_br(dev->priv);
-        }
         rtnl_unlock();
 
 }
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index eda0fbfc923a..bb15e9e259b1 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -27,7 +27,9 @@ static int get_bridge_ifindices(int *indices, int num)
         struct net_device *dev;
         int i = 0;
 
-        for (dev = dev_base; dev && i < num; dev = dev->next) {
+        for_each_netdev(dev) {
+                if (i >= num)
+                        break;
                 if (dev->priv_flags & IFF_EBRIDGE)
                         indices[i++] = dev->ifindex;
         }
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 35facc0c11c2..0fcf6f073064 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -109,7 +109,8 @@ static int br_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
         struct net_device *dev;
         int idx;
 
-        for (dev = dev_base, idx = 0; dev; dev = dev->next) {
+        idx = 0;
+        for_each_netdev(dev) {
                 /* not a bridge port */
                 if (dev->br_port == NULL || idx < cb->args[0])
                         goto skip;