aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wavelan/wavelan_cs.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-02-18 00:10:14 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-18 17:47:51 -0500
commitd59079425f6f1be0da995926b5ad1d54d9e4545d (patch)
tree26eb7414eba48eba2b5760b867c11e252701a9a6 /drivers/staging/wavelan/wavelan_cs.c
parenta92635dc77b14f0f28d45c0fbf91b5064d9d7617 (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_cs.c')
-rw-r--r--drivers/staging/wavelan/wavelan_cs.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/wavelan/wavelan_cs.c b/drivers/staging/wavelan/wavelan_cs.c
index 08fcb226d7d..04f691d127b 100644
--- a/drivers/staging/wavelan/wavelan_cs.c
+++ b/drivers/staging/wavelan/wavelan_cs.c
@@ -1410,8 +1410,7 @@ wavelan_set_multicast_list(struct net_device * dev)
1410 } 1410 }
1411 else 1411 else
1412 /* If there is some multicast addresses to send */ 1412 /* If there is some multicast addresses to send */
1413 if(dev->mc_list != (struct dev_mc_list *) NULL) 1413 if (!netdev_mc_empty(dev)) {
1414 {
1415 /* 1414 /*
1416 * Disable promiscuous mode, but receive all packets 1415 * Disable promiscuous mode, but receive all packets
1417 * in multicast list 1416 * in multicast list
@@ -3598,13 +3597,13 @@ wv_82593_config(struct net_device * dev)
3598 /* If any multicast address to set */ 3597 /* If any multicast address to set */
3599 if(lp->mc_count) 3598 if(lp->mc_count)
3600 { 3599 {
3601 struct dev_mc_list * dmi; 3600 struct dev_mc_list *dmi;
3602 int addrs_len = WAVELAN_ADDR_SIZE * lp->mc_count; 3601 int addrs_len = WAVELAN_ADDR_SIZE * lp->mc_count;
3603 3602
3604#ifdef DEBUG_CONFIG_INFO 3603#ifdef DEBUG_CONFIG_INFO
3605 printk(KERN_DEBUG "%s: wv_hw_config(): set %d multicast addresses:\n", 3604 printk(KERN_DEBUG "%s: wv_hw_config(): set %d multicast addresses:\n",
3606 dev->name, lp->mc_count); 3605 dev->name, lp->mc_count);
3607 for(dmi=dev->mc_list; dmi; dmi=dmi->next) 3606 netdev_for_each_mc_addr(dmi, dev)
3608 printk(KERN_DEBUG " %pM\n", dmi->dmi_addr); 3607 printk(KERN_DEBUG " %pM\n", dmi->dmi_addr);
3609#endif 3608#endif
3610 3609
@@ -3613,7 +3612,7 @@ wv_82593_config(struct net_device * dev)
3613 outb(((TX_BASE >> 8) & PIORH_MASK) | PIORH_SEL_TX, PIORH(base)); 3612 outb(((TX_BASE >> 8) & PIORH_MASK) | PIORH_SEL_TX, PIORH(base));
3614 outb(addrs_len & 0xff, PIOP(base)); /* byte count lsb */ 3613 outb(addrs_len & 0xff, PIOP(base)); /* byte count lsb */
3615 outb((addrs_len >> 8), PIOP(base)); /* byte count msb */ 3614 outb((addrs_len >> 8), PIOP(base)); /* byte count msb */
3616 for(dmi=dev->mc_list; dmi; dmi=dmi->next) 3615 netdev_for_each_mc_addr(dmi, dev)
3617 outsb(PIOP(base), dmi->dmi_addr, dmi->dmi_addrlen); 3616 outsb(PIOP(base), dmi->dmi_addr, dmi->dmi_addrlen);
3618 3617
3619 /* reset transmit DMA pointer */ 3618 /* reset transmit DMA pointer */