Merge branch 'linux-2.6'

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 1a6aeac5a1c3..01fbdd38e3be 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -194,15 +194,15 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
         sl = sl_tail = NULL;
 
         read_lock(&dev_base_lock);
-        for (ifp = dev_base; ifp; dev_put(ifp), ifp = ifp->next) {
+        for_each_netdev(ifp) {
                 dev_hold(ifp);
                 if (!is_aoe_netif(ifp))
-                        continue;
+                        goto cont;
 
                 skb = new_skb(sizeof *h + sizeof *ch);
                 if (skb == NULL) {
                         printk(KERN_INFO "aoe: skb alloc failure\n");
-                        continue;
+                        goto cont;
                 }
                 skb_put(skb, sizeof *h + sizeof *ch);
                 skb->dev = ifp;
@@ -221,6 +221,8 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
 
                 skb->next = sl;
                 sl = skb;
+cont:
+                dev_put(ifp);
         }
         read_unlock(&dev_base_lock);