diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-07 23:30:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-12 14:38:58 -0500 |
commit | 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch) | |
tree | 99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/net/ibm_newemac | |
parent | 8e5574211d96c0552f84c757718475fdb4021be7 (diff) |
net: use netdev_mc_count and netdev_mc_empty when appropriate
This patch replaces dev->mc_count in all drivers (hopefully I didn't miss
anything). Used spatch and did small tweaks and conding style changes when
it was suitable.
Jirka
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ibm_newemac')
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index fb5e019169ee..b75d27e82a3d 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -391,7 +391,7 @@ static void emac_hash_mc(struct emac_instance *dev) | |||
391 | struct dev_mc_list *dmi; | 391 | struct dev_mc_list *dmi; |
392 | int i; | 392 | int i; |
393 | 393 | ||
394 | DBG(dev, "hash_mc %d" NL, dev->ndev->mc_count); | 394 | DBG(dev, "hash_mc %d" NL, netdev_mc_count(dev->ndev)); |
395 | 395 | ||
396 | memset(gaht_temp, 0, sizeof (gaht_temp)); | 396 | memset(gaht_temp, 0, sizeof (gaht_temp)); |
397 | 397 | ||
@@ -425,9 +425,9 @@ static inline u32 emac_iff2rmr(struct net_device *ndev) | |||
425 | if (ndev->flags & IFF_PROMISC) | 425 | if (ndev->flags & IFF_PROMISC) |
426 | r |= EMAC_RMR_PME; | 426 | r |= EMAC_RMR_PME; |
427 | else if (ndev->flags & IFF_ALLMULTI || | 427 | else if (ndev->flags & IFF_ALLMULTI || |
428 | (ndev->mc_count > EMAC_XAHT_SLOTS(dev))) | 428 | (netdev_mc_count(ndev) > EMAC_XAHT_SLOTS(dev))) |
429 | r |= EMAC_RMR_PMME; | 429 | r |= EMAC_RMR_PMME; |
430 | else if (ndev->mc_count > 0) | 430 | else if (!netdev_mc_empty(ndev)) |
431 | r |= EMAC_RMR_MAE; | 431 | r |= EMAC_RMR_MAE; |
432 | 432 | ||
433 | return r; | 433 | return r; |