net: convert multiple drivers to use netdev_for_each_mc_addr, part5 V2

removed some needless checks and also corrected bug in lp486e (dmi was passed
instead of dmi->dmi_addr)

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index fdb0bbdd6782..57534f0e906d 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -588,7 +588,7 @@ static void mace_set_multicast(struct net_device *dev)
 {
     struct mace_data *mp = netdev_priv(dev);
     volatile struct mace __iomem *mb = mp->mace;
-    int i, j;
+    int i;
     u32 crc;
     unsigned long flags;
 
@@ -598,7 +598,7 @@ static void mace_set_multicast(struct net_device *dev)
         mp->maccc |= PROM;
     } else {
         unsigned char multicast_filter[8];
-        struct dev_mc_list *dmi = dev->mc_list;
+        struct dev_mc_list *dmi;
 
         if (dev->flags & IFF_ALLMULTI) {
             for (i = 0; i < 8; i++)
@@ -606,11 +606,10 @@ static void mace_set_multicast(struct net_device *dev)
         } else {
             for (i = 0; i < 8; i++)
                 multicast_filter[i] = 0;
-            for (i = 0; i < netdev_mc_count(dev); i++) {
+            netdev_for_each_mc_addr(dmi, dev) {
                 crc = ether_crc_le(6, dmi->dmi_addr);
-                j = crc >> 26;  /* bit number in multicast_filter */
-                multicast_filter[j >> 3] |= 1 << (j & 7);
-                dmi = dmi->next;
+                i = crc >> 26;  /* bit number in multicast_filter */
+                multicast_filter[i >> 3] |= 1 << (i & 7);
             }
         }
 #if 0