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/skfp/skfddi.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/skfp/skfddi.c')
-rw-r--r-- | drivers/net/skfp/skfddi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 6b955a4f19b2..346adfae986f 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -872,14 +872,14 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev) | |||
872 | if (dev->flags & IFF_ALLMULTI) { | 872 | if (dev->flags & IFF_ALLMULTI) { |
873 | mac_drv_rx_mode(smc, RX_ENABLE_ALLMULTI); | 873 | mac_drv_rx_mode(smc, RX_ENABLE_ALLMULTI); |
874 | pr_debug(KERN_INFO "ENABLE ALL MC ADDRESSES\n"); | 874 | pr_debug(KERN_INFO "ENABLE ALL MC ADDRESSES\n"); |
875 | } else if (dev->mc_count > 0) { | 875 | } else if (!netdev_mc_empty(dev)) { |
876 | if (dev->mc_count <= FPMAX_MULTICAST) { | 876 | if (netdev_mc_count(dev) <= FPMAX_MULTICAST) { |
877 | /* use exact filtering */ | 877 | /* use exact filtering */ |
878 | 878 | ||
879 | // point to first multicast addr | 879 | // point to first multicast addr |
880 | dmi = dev->mc_list; | 880 | dmi = dev->mc_list; |
881 | 881 | ||
882 | for (i = 0; i < dev->mc_count; i++) { | 882 | for (i = 0; i < netdev_mc_count(dev); i++) { |
883 | mac_add_multicast(smc, | 883 | mac_add_multicast(smc, |
884 | (struct fddi_addr *)dmi->dmi_addr, | 884 | (struct fddi_addr *)dmi->dmi_addr, |
885 | 1); | 885 | 1); |