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/ioc3-eth.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/ioc3-eth.c')
-rw-r--r-- | drivers/net/ioc3-eth.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index 81a4c5d30733..0bd5fef22d49 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
@@ -1681,14 +1681,15 @@ static void ioc3_set_multicast_list(struct net_device *dev) | |||
1681 | ioc3_w_emcr(ip->emcr); /* Clear promiscuous. */ | 1681 | ioc3_w_emcr(ip->emcr); /* Clear promiscuous. */ |
1682 | (void) ioc3_r_emcr(); | 1682 | (void) ioc3_r_emcr(); |
1683 | 1683 | ||
1684 | if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 64)) { | 1684 | if ((dev->flags & IFF_ALLMULTI) || |
1685 | (netdev_mc_count(dev) > 64)) { | ||
1685 | /* Too many for hashing to make sense or we want all | 1686 | /* Too many for hashing to make sense or we want all |
1686 | multicast packets anyway, so skip computing all the | 1687 | multicast packets anyway, so skip computing all the |
1687 | hashes and just accept all packets. */ | 1688 | hashes and just accept all packets. */ |
1688 | ip->ehar_h = 0xffffffff; | 1689 | ip->ehar_h = 0xffffffff; |
1689 | ip->ehar_l = 0xffffffff; | 1690 | ip->ehar_l = 0xffffffff; |
1690 | } else { | 1691 | } else { |
1691 | for (i = 0; i < dev->mc_count; i++) { | 1692 | for (i = 0; i < netdev_mc_count(dev); i++) { |
1692 | char *addr = dmi->dmi_addr; | 1693 | char *addr = dmi->dmi_addr; |
1693 | dmi = dmi->next; | 1694 | dmi = dmi->next; |
1694 | 1695 | ||