1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 189fa69c2094..119468e76323 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1000,7 +1000,7 @@ static void bmac_set_multicast(struct net_device *dev)
                         rx_cfg = bmac_rx_on(dev, 0, 0);
                         XXDEBUG(("bmac: multi disabled, rx_cfg=%#08x\n", rx_cfg));
                 } else {
-                        for (dmi=dev->mc_list; dmi!=NULL; dmi=dmi->next)
+                        netdev_for_each_mc_addr(dmi, dev)
                                 bmac_addhash(bp, dmi->dmi_addr);
                         bmac_update_hash_table_mask(dev, bp);
                         rx_cfg = bmac_rx_on(dev, 1, 0);
@@ -1015,7 +1015,7 @@ static void bmac_set_multicast(struct net_device *dev)
 
 static void bmac_set_multicast(struct net_device *dev)
 {
-        struct dev_mc_list *dmi = dev->mc_list;
+        struct dev_mc_list *dmi;
         char *addrs;
         int i;
         unsigned short rx_cfg;
@@ -1039,9 +1039,8 @@ static void bmac_set_multicast(struct net_device *dev)
 
                 for(i = 0; i < 4; i++) hash_table[i] = 0;
 
-                for(i = 0; i < netdev_mc_count(dev); i++) {
+                netdev_for_each_mc_addr(dmi, dev) {
                         addrs = dmi->dmi_addr;
-                        dmi = dmi->next;
 
                         if(!(*addrs & 1))
                                 continue;