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/staging/vt6655 | |
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/staging/vt6655')
-rw-r--r-- | drivers/staging/vt6655/device_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 0db8d7b6e79..82b3a6e0b15 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c | |||
@@ -3093,7 +3093,7 @@ static void device_set_multi(struct net_device *dev) { | |||
3093 | /* Unconditionally log net taps. */ | 3093 | /* Unconditionally log net taps. */ |
3094 | pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST|RCR_UNICAST); | 3094 | pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST|RCR_UNICAST); |
3095 | } | 3095 | } |
3096 | else if ((dev->mc_count > pDevice->multicast_limit) | 3096 | else if ((netdev_mc_count(dev) > pDevice->multicast_limit) |
3097 | || (dev->flags & IFF_ALLMULTI)) { | 3097 | || (dev->flags & IFF_ALLMULTI)) { |
3098 | MACvSelectPage1(pDevice->PortOffset); | 3098 | MACvSelectPage1(pDevice->PortOffset); |
3099 | VNSvOutPortD(pDevice->PortOffset + MAC_REG_MAR0, 0xffffffff); | 3099 | VNSvOutPortD(pDevice->PortOffset + MAC_REG_MAR0, 0xffffffff); |
@@ -3103,7 +3103,7 @@ static void device_set_multi(struct net_device *dev) { | |||
3103 | } | 3103 | } |
3104 | else { | 3104 | else { |
3105 | memset(mc_filter, 0, sizeof(mc_filter)); | 3105 | memset(mc_filter, 0, sizeof(mc_filter)); |
3106 | for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; | 3106 | for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev); |
3107 | i++, mclist = mclist->next) { | 3107 | i++, mclist = mclist->next) { |
3108 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | 3108 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; |
3109 | mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31)); | 3109 | mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31)); |