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/sunhme.c | |
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/sunhme.c')
-rw-r--r-- | drivers/net/sunhme.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 76ccd31cbf50..905df35ff78a 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -1516,7 +1516,7 @@ static int happy_meal_init(struct happy_meal *hp) | |||
1516 | 1516 | ||
1517 | HMD(("htable, ")); | 1517 | HMD(("htable, ")); |
1518 | if ((hp->dev->flags & IFF_ALLMULTI) || | 1518 | if ((hp->dev->flags & IFF_ALLMULTI) || |
1519 | (hp->dev->mc_count > 64)) { | 1519 | (netdev_mc_count(hp->dev) > 64)) { |
1520 | hme_write32(hp, bregs + BMAC_HTABLE0, 0xffff); | 1520 | hme_write32(hp, bregs + BMAC_HTABLE0, 0xffff); |
1521 | hme_write32(hp, bregs + BMAC_HTABLE1, 0xffff); | 1521 | hme_write32(hp, bregs + BMAC_HTABLE1, 0xffff); |
1522 | hme_write32(hp, bregs + BMAC_HTABLE2, 0xffff); | 1522 | hme_write32(hp, bregs + BMAC_HTABLE2, 0xffff); |
@@ -1531,7 +1531,7 @@ static int happy_meal_init(struct happy_meal *hp) | |||
1531 | for (i = 0; i < 4; i++) | 1531 | for (i = 0; i < 4; i++) |
1532 | hash_table[i] = 0; | 1532 | hash_table[i] = 0; |
1533 | 1533 | ||
1534 | for (i = 0; i < hp->dev->mc_count; i++) { | 1534 | for (i = 0; i < netdev_mc_count(hp->dev); i++) { |
1535 | addrs = dmi->dmi_addr; | 1535 | addrs = dmi->dmi_addr; |
1536 | dmi = dmi->next; | 1536 | dmi = dmi->next; |
1537 | 1537 | ||
@@ -2373,7 +2373,7 @@ static void happy_meal_set_multicast(struct net_device *dev) | |||
2373 | 2373 | ||
2374 | spin_lock_irq(&hp->happy_lock); | 2374 | spin_lock_irq(&hp->happy_lock); |
2375 | 2375 | ||
2376 | if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 64)) { | 2376 | if ((dev->flags & IFF_ALLMULTI) || (netdev_mc_count(dev) > 64)) { |
2377 | hme_write32(hp, bregs + BMAC_HTABLE0, 0xffff); | 2377 | hme_write32(hp, bregs + BMAC_HTABLE0, 0xffff); |
2378 | hme_write32(hp, bregs + BMAC_HTABLE1, 0xffff); | 2378 | hme_write32(hp, bregs + BMAC_HTABLE1, 0xffff); |
2379 | hme_write32(hp, bregs + BMAC_HTABLE2, 0xffff); | 2379 | hme_write32(hp, bregs + BMAC_HTABLE2, 0xffff); |
@@ -2387,7 +2387,7 @@ static void happy_meal_set_multicast(struct net_device *dev) | |||
2387 | for (i = 0; i < 4; i++) | 2387 | for (i = 0; i < 4; i++) |
2388 | hash_table[i] = 0; | 2388 | hash_table[i] = 0; |
2389 | 2389 | ||
2390 | for (i = 0; i < dev->mc_count; i++) { | 2390 | for (i = 0; i < netdev_mc_count(dev); i++) { |
2391 | addrs = dmi->dmi_addr; | 2391 | addrs = dmi->dmi_addr; |
2392 | dmi = dmi->next; | 2392 | dmi = dmi->next; |
2393 | 2393 | ||