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/au1000_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/au1000_eth.c')
-rw-r--r-- | drivers/net/au1000_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 6bac04603a88..9337d023919c 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -1013,7 +1013,7 @@ static void au1000_multicast_list(struct net_device *dev) | |||
1013 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ | 1013 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ |
1014 | aup->mac->control |= MAC_PROMISCUOUS; | 1014 | aup->mac->control |= MAC_PROMISCUOUS; |
1015 | } else if ((dev->flags & IFF_ALLMULTI) || | 1015 | } else if ((dev->flags & IFF_ALLMULTI) || |
1016 | dev->mc_count > MULTICAST_FILTER_LIMIT) { | 1016 | netdev_mc_count(dev) > MULTICAST_FILTER_LIMIT) { |
1017 | aup->mac->control |= MAC_PASS_ALL_MULTI; | 1017 | aup->mac->control |= MAC_PASS_ALL_MULTI; |
1018 | aup->mac->control &= ~MAC_PROMISCUOUS; | 1018 | aup->mac->control &= ~MAC_PROMISCUOUS; |
1019 | printk(KERN_INFO "%s: Pass all multicast\n", dev->name); | 1019 | printk(KERN_INFO "%s: Pass all multicast\n", dev->name); |
@@ -1023,7 +1023,7 @@ static void au1000_multicast_list(struct net_device *dev) | |||
1023 | u32 mc_filter[2]; /* Multicast hash filter */ | 1023 | u32 mc_filter[2]; /* Multicast hash filter */ |
1024 | 1024 | ||
1025 | mc_filter[1] = mc_filter[0] = 0; | 1025 | mc_filter[1] = mc_filter[0] = 0; |
1026 | for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; | 1026 | for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev); |
1027 | i++, mclist = mclist->next) { | 1027 | i++, mclist = mclist->next) { |
1028 | set_bit(ether_crc(ETH_ALEN, mclist->dmi_addr)>>26, | 1028 | set_bit(ether_crc(ETH_ALEN, mclist->dmi_addr)>>26, |
1029 | (long *)mc_filter); | 1029 | (long *)mc_filter); |