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/sis190.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/sis190.c')
-rw-r--r-- | drivers/net/sis190.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 626de766443a..8c4e38f9ebf7 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -841,7 +841,7 @@ static void sis190_set_rx_mode(struct net_device *dev) | |||
841 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | | 841 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | |
842 | AcceptAllPhys; | 842 | AcceptAllPhys; |
843 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 843 | mc_filter[1] = mc_filter[0] = 0xffffffff; |
844 | } else if ((dev->mc_count > multicast_filter_limit) || | 844 | } else if ((netdev_mc_count(dev) > multicast_filter_limit) || |
845 | (dev->flags & IFF_ALLMULTI)) { | 845 | (dev->flags & IFF_ALLMULTI)) { |
846 | /* Too many to filter perfectly -- accept all multicasts. */ | 846 | /* Too many to filter perfectly -- accept all multicasts. */ |
847 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 847 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
@@ -852,7 +852,7 @@ static void sis190_set_rx_mode(struct net_device *dev) | |||
852 | 852 | ||
853 | rx_mode = AcceptBroadcast | AcceptMyPhys; | 853 | rx_mode = AcceptBroadcast | AcceptMyPhys; |
854 | mc_filter[1] = mc_filter[0] = 0; | 854 | mc_filter[1] = mc_filter[0] = 0; |
855 | for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; | 855 | for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev); |
856 | i++, mclist = mclist->next) { | 856 | i++, mclist = mclist->next) { |
857 | int bit_nr = | 857 | int bit_nr = |
858 | ether_crc(ETH_ALEN, mclist->dmi_addr) & 0x3f; | 858 | ether_crc(ETH_ALEN, mclist->dmi_addr) & 0x3f; |