aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-02-07 23:30:35 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-12 14:38:58 -0500
commit4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch)
tree99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/net/r8169.c
parent8e5574211d96c0552f84c757718475fdb4021be7 (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/r8169.c')
-rw-r--r--drivers/net/r8169.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index c1bb24cf0793..85c635f354b5 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4758,7 +4758,7 @@ static void rtl_set_rx_mode(struct net_device *dev)
4758 AcceptBroadcast | AcceptMulticast | AcceptMyPhys | 4758 AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
4759 AcceptAllPhys; 4759 AcceptAllPhys;
4760 mc_filter[1] = mc_filter[0] = 0xffffffff; 4760 mc_filter[1] = mc_filter[0] = 0xffffffff;
4761 } else if ((dev->mc_count > multicast_filter_limit) || 4761 } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
4762 (dev->flags & IFF_ALLMULTI)) { 4762 (dev->flags & IFF_ALLMULTI)) {
4763 /* Too many to filter perfectly -- accept all multicasts. */ 4763 /* Too many to filter perfectly -- accept all multicasts. */
4764 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; 4764 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
@@ -4769,7 +4769,7 @@ static void rtl_set_rx_mode(struct net_device *dev)
4769 4769
4770 rx_mode = AcceptBroadcast | AcceptMyPhys; 4770 rx_mode = AcceptBroadcast | AcceptMyPhys;
4771 mc_filter[1] = mc_filter[0] = 0; 4771 mc_filter[1] = mc_filter[0] = 0;
4772 for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; 4772 for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev);
4773 i++, mclist = mclist->next) { 4773 i++, mclist = mclist->next) {
4774 int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; 4774 int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
4775 mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); 4775 mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);