diff options
Diffstat (limited to 'drivers/net/stmmac/dwmac100.c')
-rw-r--r-- | drivers/net/stmmac/dwmac100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/stmmac/dwmac100.c b/drivers/net/stmmac/dwmac100.c index ac48ed787040..576b256ee388 100644 --- a/drivers/net/stmmac/dwmac100.c +++ b/drivers/net/stmmac/dwmac100.c | |||
@@ -305,13 +305,13 @@ static void dwmac100_set_filter(struct net_device *dev) | |||
305 | value |= MAC_CONTROL_PR; | 305 | value |= MAC_CONTROL_PR; |
306 | value &= ~(MAC_CONTROL_PM | MAC_CONTROL_IF | MAC_CONTROL_HO | | 306 | value &= ~(MAC_CONTROL_PM | MAC_CONTROL_IF | MAC_CONTROL_HO | |
307 | MAC_CONTROL_HP); | 307 | MAC_CONTROL_HP); |
308 | } else if ((dev->mc_count > HASH_TABLE_SIZE) | 308 | } else if ((netdev_mc_count(dev) > HASH_TABLE_SIZE) |
309 | || (dev->flags & IFF_ALLMULTI)) { | 309 | || (dev->flags & IFF_ALLMULTI)) { |
310 | value |= MAC_CONTROL_PM; | 310 | value |= MAC_CONTROL_PM; |
311 | value &= ~(MAC_CONTROL_PR | MAC_CONTROL_IF | MAC_CONTROL_HO); | 311 | value &= ~(MAC_CONTROL_PR | MAC_CONTROL_IF | MAC_CONTROL_HO); |
312 | writel(0xffffffff, ioaddr + MAC_HASH_HIGH); | 312 | writel(0xffffffff, ioaddr + MAC_HASH_HIGH); |
313 | writel(0xffffffff, ioaddr + MAC_HASH_LOW); | 313 | writel(0xffffffff, ioaddr + MAC_HASH_LOW); |
314 | } else if (dev->mc_count == 0) { /* no multicast */ | 314 | } else if (netdev_mc_empty(dev)) { /* no multicast */ |
315 | value &= ~(MAC_CONTROL_PM | MAC_CONTROL_PR | MAC_CONTROL_IF | | 315 | value &= ~(MAC_CONTROL_PM | MAC_CONTROL_PR | MAC_CONTROL_IF | |
316 | MAC_CONTROL_HO | MAC_CONTROL_HP); | 316 | MAC_CONTROL_HO | MAC_CONTROL_HP); |
317 | } else { | 317 | } else { |
@@ -327,7 +327,7 @@ static void dwmac100_set_filter(struct net_device *dev) | |||
327 | 327 | ||
328 | memset(mc_filter, 0, sizeof(mc_filter)); | 328 | memset(mc_filter, 0, sizeof(mc_filter)); |
329 | for (i = 0, mclist = dev->mc_list; | 329 | for (i = 0, mclist = dev->mc_list; |
330 | mclist && i < dev->mc_count; i++, mclist = mclist->next) { | 330 | mclist && i < netdev_mc_count(dev); i++, mclist = mclist->next) { |
331 | /* The upper 6 bits of the calculated CRC are used to | 331 | /* The upper 6 bits of the calculated CRC are used to |
332 | * index the contens of the hash table */ | 332 | * index the contens of the hash table */ |
333 | int bit_nr = | 333 | int bit_nr = |