4 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index c8bc60a7040c..17d85d98987d 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -563,7 +563,7 @@ static void at91ether_sethashtable(struct net_device *dev)
         mc_filter[0] = mc_filter[1] = 0;
 
         curr = dev->mc_list;
-        for (i = 0; i < dev->mc_count; i++, curr = curr->next) {
+        for (i = 0; i < netdev_mc_count(dev); i++, curr = curr->next) {
                 if (!curr) break;       /* unexpected end of list */
 
                 bitnr = hash_get_index(curr->dmi_addr);
@@ -592,7 +592,7 @@ static void at91ether_set_multicast_list(struct net_device *dev)
                 at91_emac_write(AT91_EMAC_HSH, -1);
                 at91_emac_write(AT91_EMAC_HSL, -1);
                 cfg |= AT91_EMAC_MTI;
-        } else if (dev->mc_count > 0) {                 /* Enable specific multicasts */
+        } else if (!netdev_mc_empty(dev)) { /* Enable specific multicasts */
                 at91ether_sethashtable(dev);
                 cfg |= AT91_EMAC_MTI;
         } else if (dev->flags & (~IFF_ALLMULTI)) {      /* Disable all multicast mode */
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 1f7a69c929a6..d9de9bce2395 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -463,7 +463,7 @@ static void ether3_setmulticastlist(struct net_device *dev)
         if (dev->flags & IFF_PROMISC) {
                 /* promiscuous mode */
                 priv(dev)->regs.config1 |= CFG1_RECVPROMISC;
-        } else if (dev->flags & IFF_ALLMULTI || dev->mc_count) {
+        } else if (dev->flags & IFF_ALLMULTI || !netdev_mc_empty(dev)) {
                 priv(dev)->regs.config1 |= CFG1_RECVSPECBRMULTI;
         } else
                 priv(dev)->regs.config1 |= CFG1_RECVSPECBROAD;
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index c3dfbdd2cdcf..1a5f78b160f9 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -737,7 +737,7 @@ static void eth_set_mcast_list(struct net_device *dev)
         struct port *port = netdev_priv(dev);
         struct dev_mc_list *mclist = dev->mc_list;
         u8 diffs[ETH_ALEN], *addr;
-        int cnt = dev->mc_count, i;
+        int cnt = netdev_mc_count(dev), i;
 
         if ((dev->flags & IFF_PROMISC) || !mclist || !cnt) {
                 __raw_writel(DEFAULT_RX_CNTRL0 & ~RX_CNTRL0_ADDR_FLTR_EN,
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index be256b34cea8..1dc181a9fbc3 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -1207,7 +1207,7 @@ ks8695_set_multicast(struct net_device *ndev)
         if (ndev->flags & IFF_ALLMULTI) {
                 /* enable all multicast mode */
                 ctrl |= DRXC_RM;
-        } else if (ndev->mc_count > KS8695_NR_ADDRESSES) {
+        } else if (netdev_mc_count(ndev) > KS8695_NR_ADDRESSES) {
                 /* more specific multicast addresses than can be
                  * handled in hardware
                  */
@@ -1216,7 +1216,7 @@ ks8695_set_multicast(struct net_device *ndev)
                 /* enable specific multicasts */
                 ctrl &= ~DRXC_RM;
                 ks8695_init_partial_multicast(ksp, ndev->mc_list,
-                                              ndev->mc_count);
+                                              netdev_mc_count(ndev));
         }
 
         ks8695_writereg(ksp, KS8695_DRXC, ctrl);