aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ehea
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/ehea
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/ehea')
-rw-r--r--drivers/net/ehea/ehea_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 7b62336e6736..99e4f8360d2f 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -1981,7 +1981,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
1981 } 1981 }
1982 ehea_allmulti(dev, 0); 1982 ehea_allmulti(dev, 0);
1983 1983
1984 if (dev->mc_count) { 1984 if (!netdev_mc_empty(dev)) {
1985 ret = ehea_drop_multicast_list(dev); 1985 ret = ehea_drop_multicast_list(dev);
1986 if (ret) { 1986 if (ret) {
1987 /* Dropping the current multicast list failed. 1987 /* Dropping the current multicast list failed.
@@ -1990,14 +1990,14 @@ static void ehea_set_multicast_list(struct net_device *dev)
1990 ehea_allmulti(dev, 1); 1990 ehea_allmulti(dev, 1);
1991 } 1991 }
1992 1992
1993 if (dev->mc_count > port->adapter->max_mc_mac) { 1993 if (netdev_mc_count(dev) > port->adapter->max_mc_mac) {
1994 ehea_info("Mcast registration limit reached (0x%llx). " 1994 ehea_info("Mcast registration limit reached (0x%llx). "
1995 "Use ALLMULTI!", 1995 "Use ALLMULTI!",
1996 port->adapter->max_mc_mac); 1996 port->adapter->max_mc_mac);
1997 goto out; 1997 goto out;
1998 } 1998 }
1999 1999
2000 for (i = 0, k_mcl_entry = dev->mc_list; i < dev->mc_count; i++, 2000 for (i = 0, k_mcl_entry = dev->mc_list; i < netdev_mc_count(dev); i++,
2001 k_mcl_entry = k_mcl_entry->next) 2001 k_mcl_entry = k_mcl_entry->next)
2002 ehea_add_multicast_entry(port, k_mcl_entry->dmi_addr); 2002 ehea_add_multicast_entry(port, k_mcl_entry->dmi_addr);
2003 2003