1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 321e73aabb2b..c7d6f094cc7a 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -2509,7 +2509,7 @@ static void __set_rx_mode (struct net_device *dev)
         struct rtl8139_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
         u32 mc_filter[2];       /* Multicast hash filter */
-        int i, rx_mode;
+        int rx_mode;
         u32 tmp;
 
         pr_debug("%s:   rtl8139_set_rx_mode(%4.4x) done -- Rx config %8.8lx.\n",
@@ -2521,7 +2521,7 @@ static void __set_rx_mode (struct net_device *dev)
                     AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
                     AcceptAllPhys;
                 mc_filter[1] = mc_filter[0] = 0xffffffff;
-        } else if ((dev->mc_count > multicast_filter_limit) ||
+        } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
                    (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to filter perfectly -- accept all multicasts. */
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
@@ -2530,8 +2530,7 @@ static void __set_rx_mode (struct net_device *dev)
                 struct dev_mc_list *mclist;
                 rx_mode = AcceptBroadcast | AcceptMyPhys;
                 mc_filter[1] = mc_filter[0] = 0;
-                for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-                     i++, mclist = mclist->next) {
+                netdev_for_each_mc_addr(mclist, dev) {
                         int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
 
                         mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);