aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r--drivers/net/sky2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 478288b8bc21..45299d663498 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3626,7 +3626,7 @@ static void sky2_set_multicast(struct net_device *dev)
3626 reg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA); 3626 reg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
3627 else if (dev->flags & IFF_ALLMULTI) 3627 else if (dev->flags & IFF_ALLMULTI)
3628 memset(filter, 0xff, sizeof(filter)); 3628 memset(filter, 0xff, sizeof(filter));
3629 else if (dev->mc_count == 0 && !rx_pause) 3629 else if (netdev_mc_empty(dev) && !rx_pause)
3630 reg &= ~GM_RXCR_MCF_ENA; 3630 reg &= ~GM_RXCR_MCF_ENA;
3631 else { 3631 else {
3632 int i; 3632 int i;
@@ -3635,7 +3635,7 @@ static void sky2_set_multicast(struct net_device *dev)
3635 if (rx_pause) 3635 if (rx_pause)
3636 sky2_add_filter(filter, pause_mc_addr); 3636 sky2_add_filter(filter, pause_mc_addr);
3637 3637
3638 for (i = 0; list && i < dev->mc_count; i++, list = list->next) 3638 for (i = 0; list && i < netdev_mc_count(dev); i++, list = list->next)
3639 sky2_add_filter(filter, list->dmi_addr); 3639 sky2_add_filter(filter, list->dmi_addr);
3640 } 3640 }
3641 3641