net: convert multiple drivers to use netdev_for_each_mc_addr, part2

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

2 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/stmmac/dwmac100.c b/drivers/net/stmmac/dwmac100.c
index 576b256ee388..803b0373d843 100644
--- a/drivers/net/stmmac/dwmac100.c
+++ b/drivers/net/stmmac/dwmac100.c
@@ -315,7 +315,6 @@ static void dwmac100_set_filter(struct net_device *dev)
                 value &= ~(MAC_CONTROL_PM | MAC_CONTROL_PR | MAC_CONTROL_IF |
                            MAC_CONTROL_HO | MAC_CONTROL_HP);
         } else {
-                int i;
                 u32 mc_filter[2];
                 struct dev_mc_list *mclist;
 
@@ -326,8 +325,7 @@ static void dwmac100_set_filter(struct net_device *dev)
                            MAC_CONTROL_IF | MAC_CONTROL_HO);
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                for (i = 0, mclist = dev->mc_list;
-                     mclist && i < netdev_mc_count(dev); i++, mclist = mclist->next) {
+                netdev_for_each_mc_addr(mclist, dev) {
                         /* The upper 6 bits of the calculated CRC are used to
                          * index the contens of the hash table */
                         int bit_nr =
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c
index 90dbb4f41ef3..a6538ae4694c 100644
--- a/drivers/net/stmmac/dwmac1000_core.c
+++ b/drivers/net/stmmac/dwmac1000_core.c
@@ -93,7 +93,6 @@ static void dwmac1000_set_filter(struct net_device *dev)
                 writel(0xffffffff, ioaddr + GMAC_HASH_HIGH);
                 writel(0xffffffff, ioaddr + GMAC_HASH_LOW);
         } else if (!netdev_mc_empty(dev)) {
-                int i;
                 u32 mc_filter[2];
                 struct dev_mc_list *mclist;
 
@@ -101,8 +100,7 @@ static void dwmac1000_set_filter(struct net_device *dev)
                 value = GMAC_FRAME_FILTER_HMC;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                for (i = 0, mclist = dev->mc_list;
-                     mclist && i < netdev_mc_count(dev); i++, mclist = mclist->next) {
+                netdev_for_each_mc_addr(mclist, dev) {
                         /* The upper 6 bits of the calculated CRC are used to
                            index the contens of the hash table */
                         int bit_nr =