diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-18 00:10:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-18 17:47:51 -0500 |
commit | d59079425f6f1be0da995926b5ad1d54d9e4545d (patch) | |
tree | 26eb7414eba48eba2b5760b867c11e252701a9a6 /drivers/staging/wavelan/wavelan.c | |
parent | a92635dc77b14f0f28d45c0fbf91b5064d9d7617 (diff) |
staging: convert to use netdev_for_each_mc_addr
removed needless checks in arlan-main.c and slicoss.c
fixed bug in et131x_netdev.c to actually fill addresses in.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/wavelan/wavelan.c')
-rw-r--r-- | drivers/staging/wavelan/wavelan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/wavelan/wavelan.c b/drivers/staging/wavelan/wavelan.c index 961f1417fb5..54ca63196fd 100644 --- a/drivers/staging/wavelan/wavelan.c +++ b/drivers/staging/wavelan/wavelan.c | |||
@@ -1387,7 +1387,7 @@ static void wavelan_set_multicast_list(struct net_device * dev) | |||
1387 | } | 1387 | } |
1388 | } else | 1388 | } else |
1389 | /* Are there multicast addresses to send? */ | 1389 | /* Are there multicast addresses to send? */ |
1390 | if (dev->mc_list != (struct dev_mc_list *) NULL) { | 1390 | if (!netdev_mc_empty(dev)) { |
1391 | /* | 1391 | /* |
1392 | * Disable promiscuous mode, but receive all packets | 1392 | * Disable promiscuous mode, but receive all packets |
1393 | * in multicast list | 1393 | * in multicast list |
@@ -3531,7 +3531,7 @@ static void wv_82586_config(struct net_device * dev) | |||
3531 | 3531 | ||
3532 | /* Any address to set? */ | 3532 | /* Any address to set? */ |
3533 | if (lp->mc_count) { | 3533 | if (lp->mc_count) { |
3534 | for (dmi = dev->mc_list; dmi; dmi = dmi->next) | 3534 | netdev_for_each_mc_addr(dmi, dev) |
3535 | outsw(PIOP1(ioaddr), (u16 *) dmi->dmi_addr, | 3535 | outsw(PIOP1(ioaddr), (u16 *) dmi->dmi_addr, |
3536 | WAVELAN_ADDR_SIZE >> 1); | 3536 | WAVELAN_ADDR_SIZE >> 1); |
3537 | 3537 | ||
@@ -3539,7 +3539,7 @@ static void wv_82586_config(struct net_device * dev) | |||
3539 | printk(KERN_DEBUG | 3539 | printk(KERN_DEBUG |
3540 | "%s: wv_82586_config(): set %d multicast addresses:\n", | 3540 | "%s: wv_82586_config(): set %d multicast addresses:\n", |
3541 | dev->name, lp->mc_count); | 3541 | dev->name, lp->mc_count); |
3542 | for (dmi = dev->mc_list; dmi; dmi = dmi->next) | 3542 | netdev_for_each_mc_addr(dmi, dev) |
3543 | printk(KERN_DEBUG " %pM\n", dmi->dmi_addr); | 3543 | printk(KERN_DEBUG " %pM\n", dmi->dmi_addr); |
3544 | #endif | 3544 | #endif |
3545 | } | 3545 | } |