1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index bd8bc66f2e00..287c251075e5 100644
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -531,7 +531,7 @@ static void sonic_multicast_list(struct net_device *dev)
 {
         struct sonic_local *lp = netdev_priv(dev);
         unsigned int rcr;
-        struct dev_mc_list *dmi = dev->mc_list;
+        struct dev_mc_list *dmi;
         unsigned char *addr;
         int i;
 
@@ -549,13 +549,14 @@ static void sonic_multicast_list(struct net_device *dev)
                                 printk("sonic_multicast_list: mc_count %d\n",
                                        netdev_mc_count(dev));
                         sonic_set_cam_enable(dev, 1);  /* always enable our own address */
-                        for (i = 1; i <= netdev_mc_count(dev); i++) {
+                        i = 1;
+                        netdev_for_each_mc_addr(dmi, dev) {
                                 addr = dmi->dmi_addr;
-                                dmi = dmi->next;
                                 sonic_cda_put(dev, i, SONIC_CD_CAP0, addr[1] << 8 | addr[0]);
                                 sonic_cda_put(dev, i, SONIC_CD_CAP1, addr[3] << 8 | addr[2]);
                                 sonic_cda_put(dev, i, SONIC_CD_CAP2, addr[5] << 8 | addr[4]);
                                 sonic_set_cam_enable(dev, sonic_get_cam_enable(dev) | (1 << i));
+                                i++;
                         }
                         SONIC_WRITE(SONIC_CDC, 16);
                         /* issue Load CAM command */