aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smc91x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/smc91x.c')
-rw-r--r--drivers/net/smc91x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index ea4fae79d6ec..66450127c5a1 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1395,7 +1395,7 @@ static void smc_set_multicast_list(struct net_device *dev)
1395 * I don't need to zero the multicast table, because the flag is 1395 * I don't need to zero the multicast table, because the flag is
1396 * checked before the table is 1396 * checked before the table is
1397 */ 1397 */
1398 else if (dev->flags & IFF_ALLMULTI || dev->mc_count > 16) { 1398 else if (dev->flags & IFF_ALLMULTI || netdev_mc_count(dev) > 16) {
1399 DBG(2, "%s: RCR_ALMUL\n", dev->name); 1399 DBG(2, "%s: RCR_ALMUL\n", dev->name);
1400 lp->rcr_cur_mode |= RCR_ALMUL; 1400 lp->rcr_cur_mode |= RCR_ALMUL;
1401 } 1401 }
@@ -1412,7 +1412,7 @@ static void smc_set_multicast_list(struct net_device *dev)
1412 * the number of the 8 bit register, while the low 3 bits are the bit 1412 * the number of the 8 bit register, while the low 3 bits are the bit
1413 * within that register. 1413 * within that register.
1414 */ 1414 */
1415 else if (dev->mc_count) { 1415 else if (!netdev_mc_empty(dev)) {
1416 int i; 1416 int i;
1417 struct dev_mc_list *cur_addr; 1417 struct dev_mc_list *cur_addr;
1418 1418
@@ -1423,7 +1423,7 @@ static void smc_set_multicast_list(struct net_device *dev)
1423 memset(multicast_table, 0, sizeof(multicast_table)); 1423 memset(multicast_table, 0, sizeof(multicast_table));
1424 1424
1425 cur_addr = dev->mc_list; 1425 cur_addr = dev->mc_list;
1426 for (i = 0; i < dev->mc_count; i++, cur_addr = cur_addr->next) { 1426 for (i = 0; i < netdev_mc_count(dev); i++, cur_addr = cur_addr->next) {
1427 int position; 1427 int position;
1428 1428
1429 /* do we have a pointer here? */ 1429 /* do we have a pointer here? */