diff options
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 12e3233868e9..c42a31a97fa3 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -1481,8 +1481,8 @@ static void set_multicast_list(struct net_device *dev) | |||
1481 | #ifdef PCMCIA_DEBUG | 1481 | #ifdef PCMCIA_DEBUG |
1482 | { | 1482 | { |
1483 | static int old; | 1483 | static int old; |
1484 | if (dev->mc_count != old) { | 1484 | if (netdev_mc_count(dev) != old) { |
1485 | old = dev->mc_count; | 1485 | old = netdev_mc_count(dev); |
1486 | pr_debug("%s: setting Rx mode to %d addresses.\n", | 1486 | pr_debug("%s: setting Rx mode to %d addresses.\n", |
1487 | dev->name, old); | 1487 | dev->name, old); |
1488 | } | 1488 | } |
@@ -1490,13 +1490,13 @@ static void set_multicast_list(struct net_device *dev) | |||
1490 | #endif | 1490 | #endif |
1491 | 1491 | ||
1492 | /* Set multicast_num_addrs. */ | 1492 | /* Set multicast_num_addrs. */ |
1493 | lp->multicast_num_addrs = dev->mc_count; | 1493 | lp->multicast_num_addrs = netdev_mc_count(dev); |
1494 | 1494 | ||
1495 | /* Set multicast_ladrf. */ | 1495 | /* Set multicast_ladrf. */ |
1496 | if (num_addrs > 0) { | 1496 | if (num_addrs > 0) { |
1497 | /* Calculate multicast logical address filter */ | 1497 | /* Calculate multicast logical address filter */ |
1498 | memset(lp->multicast_ladrf, 0, MACE_LADRF_LEN); | 1498 | memset(lp->multicast_ladrf, 0, MACE_LADRF_LEN); |
1499 | for (i = 0; i < dev->mc_count; i++) { | 1499 | for (i = 0; i < netdev_mc_count(dev); i++) { |
1500 | memcpy(adr, dmi->dmi_addr, ETHER_ADDR_LEN); | 1500 | memcpy(adr, dmi->dmi_addr, ETHER_ADDR_LEN); |
1501 | dmi = dmi->next; | 1501 | dmi = dmi->next; |
1502 | BuildLAF(lp->multicast_ladrf, adr); | 1502 | BuildLAF(lp->multicast_ladrf, adr); |
@@ -1537,15 +1537,15 @@ static void set_multicast_list(struct net_device *dev) | |||
1537 | #ifdef PCMCIA_DEBUG | 1537 | #ifdef PCMCIA_DEBUG |
1538 | { | 1538 | { |
1539 | static int old; | 1539 | static int old; |
1540 | if (dev->mc_count != old) { | 1540 | if (netdev_mc_count(dev) != old) { |
1541 | old = dev->mc_count; | 1541 | old = netdev_mc_count(dev); |
1542 | pr_debug("%s: setting Rx mode to %d addresses.\n", | 1542 | pr_debug("%s: setting Rx mode to %d addresses.\n", |
1543 | dev->name, old); | 1543 | dev->name, old); |
1544 | } | 1544 | } |
1545 | } | 1545 | } |
1546 | #endif | 1546 | #endif |
1547 | 1547 | ||
1548 | lp->multicast_num_addrs = dev->mc_count; | 1548 | lp->multicast_num_addrs = netdev_mc_count(dev); |
1549 | restore_multicast_list(dev); | 1549 | restore_multicast_list(dev); |
1550 | 1550 | ||
1551 | } /* set_multicast_list */ | 1551 | } /* set_multicast_list */ |