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/usb/asix.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/usb/asix.c')
-rw-r--r-- | drivers/net/usb/asix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index a516185cbc9f..f02551713b13 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
@@ -542,9 +542,9 @@ static void asix_set_multicast(struct net_device *net) | |||
542 | if (net->flags & IFF_PROMISC) { | 542 | if (net->flags & IFF_PROMISC) { |
543 | rx_ctl |= AX_RX_CTL_PRO; | 543 | rx_ctl |= AX_RX_CTL_PRO; |
544 | } else if (net->flags & IFF_ALLMULTI || | 544 | } else if (net->flags & IFF_ALLMULTI || |
545 | net->mc_count > AX_MAX_MCAST) { | 545 | netdev_mc_count(net) > AX_MAX_MCAST) { |
546 | rx_ctl |= AX_RX_CTL_AMALL; | 546 | rx_ctl |= AX_RX_CTL_AMALL; |
547 | } else if (net->mc_count == 0) { | 547 | } else if (netdev_mc_empty(net)) { |
548 | /* just broadcast and directed */ | 548 | /* just broadcast and directed */ |
549 | } else { | 549 | } else { |
550 | /* We use the 20 byte dev->data | 550 | /* We use the 20 byte dev->data |
@@ -558,7 +558,7 @@ static void asix_set_multicast(struct net_device *net) | |||
558 | memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE); | 558 | memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE); |
559 | 559 | ||
560 | /* Build the multicast hash filter. */ | 560 | /* Build the multicast hash filter. */ |
561 | for (i = 0; i < net->mc_count; i++) { | 561 | for (i = 0; i < netdev_mc_count(net); i++) { |
562 | crc_bits = | 562 | crc_bits = |
563 | ether_crc(ETH_ALEN, | 563 | ether_crc(ETH_ALEN, |
564 | mc_list->dmi_addr) >> 26; | 564 | mc_list->dmi_addr) >> 26; |
@@ -754,9 +754,9 @@ static void ax88172_set_multicast(struct net_device *net) | |||
754 | if (net->flags & IFF_PROMISC) { | 754 | if (net->flags & IFF_PROMISC) { |
755 | rx_ctl |= 0x01; | 755 | rx_ctl |= 0x01; |
756 | } else if (net->flags & IFF_ALLMULTI || | 756 | } else if (net->flags & IFF_ALLMULTI || |
757 | net->mc_count > AX_MAX_MCAST) { | 757 | netdev_mc_count(net) > AX_MAX_MCAST) { |
758 | rx_ctl |= 0x02; | 758 | rx_ctl |= 0x02; |
759 | } else if (net->mc_count == 0) { | 759 | } else if (netdev_mc_empty(net)) { |
760 | /* just broadcast and directed */ | 760 | /* just broadcast and directed */ |
761 | } else { | 761 | } else { |
762 | /* We use the 20 byte dev->data | 762 | /* We use the 20 byte dev->data |
@@ -770,7 +770,7 @@ static void ax88172_set_multicast(struct net_device *net) | |||
770 | memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE); | 770 | memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE); |
771 | 771 | ||
772 | /* Build the multicast hash filter. */ | 772 | /* Build the multicast hash filter. */ |
773 | for (i = 0; i < net->mc_count; i++) { | 773 | for (i = 0; i < netdev_mc_count(net); i++) { |
774 | crc_bits = | 774 | crc_bits = |
775 | ether_crc(ETH_ALEN, | 775 | ether_crc(ETH_ALEN, |
776 | mc_list->dmi_addr) >> 26; | 776 | mc_list->dmi_addr) >> 26; |