1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 2f8261c9614a..a841feb5df20 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -861,7 +861,7 @@ static void set_rx_mode_8002(struct net_device *dev)
         struct net_local *lp = netdev_priv(dev);
         long ioaddr = dev->base_addr;
 
-        if (dev->mc_count > 0 || (dev->flags & (IFF_ALLMULTI|IFF_PROMISC)))
+        if (!netdev_mc_empty(dev) || (dev->flags & (IFF_ALLMULTI|IFF_PROMISC)))
                 lp->addr_mode = CMR2h_PROMISC;
         else
                 lp->addr_mode = CMR2h_Normal;
@@ -877,7 +877,8 @@ static void set_rx_mode_8012(struct net_device *dev)
 
         if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
                 new_mode = CMR2h_PROMISC;
-        } else if ((dev->mc_count > 1000)  ||  (dev->flags & IFF_ALLMULTI)) {
+        } else if ((netdev_mc_count(dev) > 1000) ||
+                   (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to filter perfectly -- accept all multicasts. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 new_mode = CMR2h_Normal;
@@ -885,7 +886,7 @@ static void set_rx_mode_8012(struct net_device *dev)
                 struct dev_mc_list *mclist;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
+                for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev);
                          i++, mclist = mclist->next)
                 {
                         int filterbit = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x3f;