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/pci-skeleton.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/pci-skeleton.c')
-rw-r--r-- | drivers/net/pci-skeleton.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 20273832bfce..bbdf0398c93f 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -1820,7 +1820,7 @@ static void netdrv_set_rx_mode (struct net_device *dev) | |||
1820 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | | 1820 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | |
1821 | AcceptAllPhys; | 1821 | AcceptAllPhys; |
1822 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 1822 | mc_filter[1] = mc_filter[0] = 0xffffffff; |
1823 | } else if ((dev->mc_count > multicast_filter_limit) || | 1823 | } else if ((netdev_mc_count(dev) > multicast_filter_limit) || |
1824 | (dev->flags & IFF_ALLMULTI)) { | 1824 | (dev->flags & IFF_ALLMULTI)) { |
1825 | /* Too many to filter perfectly -- accept all multicasts. */ | 1825 | /* Too many to filter perfectly -- accept all multicasts. */ |
1826 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 1826 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
@@ -1829,7 +1829,7 @@ static void netdrv_set_rx_mode (struct net_device *dev) | |||
1829 | struct dev_mc_list *mclist; | 1829 | struct dev_mc_list *mclist; |
1830 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 1830 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
1831 | mc_filter[1] = mc_filter[0] = 0; | 1831 | mc_filter[1] = mc_filter[0] = 0; |
1832 | for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; | 1832 | for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev); |
1833 | i++, mclist = mclist->next) { | 1833 | i++, mclist = mclist->next) { |
1834 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | 1834 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; |
1835 | 1835 | ||