aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igbvf
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/igbvf
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/igbvf')
-rw-r--r--drivers/net/igbvf/netdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index 23ce07d3de08..6029c400f2be 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -1403,8 +1403,8 @@ static void igbvf_set_multi(struct net_device *netdev)
1403 u8 *mta_list = NULL; 1403 u8 *mta_list = NULL;
1404 int i; 1404 int i;
1405 1405
1406 if (netdev->mc_count) { 1406 if (!netdev_mc_empty(netdev)) {
1407 mta_list = kmalloc(netdev->mc_count * 6, GFP_ATOMIC); 1407 mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
1408 if (!mta_list) { 1408 if (!mta_list) {
1409 dev_err(&adapter->pdev->dev, 1409 dev_err(&adapter->pdev->dev,
1410 "failed to allocate multicast filter list\n"); 1410 "failed to allocate multicast filter list\n");
@@ -1415,7 +1415,7 @@ static void igbvf_set_multi(struct net_device *netdev)
1415 /* prepare a packed array of only addresses. */ 1415 /* prepare a packed array of only addresses. */
1416 mc_ptr = netdev->mc_list; 1416 mc_ptr = netdev->mc_list;
1417 1417
1418 for (i = 0; i < netdev->mc_count; i++) { 1418 for (i = 0; i < netdev_mc_count(netdev); i++) {
1419 if (!mc_ptr) 1419 if (!mc_ptr)
1420 break; 1420 break;
1421 memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr, 1421 memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr,