aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r--drivers/net/macb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 1d0d4d9ab623..fbc371fa19b5 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -901,7 +901,7 @@ static void macb_sethashtable(struct net_device *dev)
901 mc_filter[0] = mc_filter[1] = 0; 901 mc_filter[0] = mc_filter[1] = 0;
902 902
903 curr = dev->mc_list; 903 curr = dev->mc_list;
904 for (i = 0; i < dev->mc_count; i++, curr = curr->next) { 904 for (i = 0; i < netdev_mc_count(dev); i++, curr = curr->next) {
905 if (!curr) break; /* unexpected end of list */ 905 if (!curr) break; /* unexpected end of list */
906 906
907 bitnr = hash_get_index(curr->dmi_addr); 907 bitnr = hash_get_index(curr->dmi_addr);
@@ -934,7 +934,7 @@ static void macb_set_rx_mode(struct net_device *dev)
934 macb_writel(bp, HRB, -1); 934 macb_writel(bp, HRB, -1);
935 macb_writel(bp, HRT, -1); 935 macb_writel(bp, HRT, -1);
936 cfg |= MACB_BIT(NCFGR_MTI); 936 cfg |= MACB_BIT(NCFGR_MTI);
937 } else if (dev->mc_count > 0) { 937 } else if (!netdev_mc_empty(dev)) {
938 /* Enable specific multicasts */ 938 /* Enable specific multicasts */
939 macb_sethashtable(dev); 939 macb_sethashtable(dev);
940 cfg |= MACB_BIT(NCFGR_MTI); 940 cfg |= MACB_BIT(NCFGR_MTI);