1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 6e4f754c4baf..edabc49a49bc 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -924,17 +924,18 @@ typhoon_set_rx_mode(struct net_device *dev)
         filter = TYPHOON_RX_FILTER_DIRECTED | TYPHOON_RX_FILTER_BROADCAST;
         if(dev->flags & IFF_PROMISC) {
                 filter |= TYPHOON_RX_FILTER_PROMISCOUS;
-        } else if((dev->mc_count > multicast_filter_limit) ||
+        } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
                   (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to match, or accept all multicasts. */
                 filter |= TYPHOON_RX_FILTER_ALL_MCAST;
-        } else if(dev->mc_count) {
+        } else if (!netdev_mc_empty(dev)) {
                 struct dev_mc_list *mclist;
                 int i;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                for(i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-                    i++, mclist = mclist->next) {
+                for (i = 0, mclist = dev->mc_list;
+                     mclist && i < netdev_mc_count(dev);
+                     i++, mclist = mclist->next) {
                         int bit = ether_crc(ETH_ALEN, mclist->dmi_addr) & 0x3f;
                         mc_filter[bit >> 5] |= 1 << (bit & 0x1f);
                 }