diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-17 19:42:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-18 17:47:49 -0500 |
commit | 5508590c193661bc1484ad7b952af5fceacea40d (patch) | |
tree | 8b7d1655f63034725127b9456afa5bad4bb6e83a /drivers/net/sun3_82586.c | |
parent | 2a0d18f97cc15d57ad0c93259a3df4cb72c5a28b (diff) |
net: convert multiple drivers to use netdev_for_each_mc_addr, part2
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sun3_82586.c')
-rw-r--r-- | drivers/net/sun3_82586.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c index efedc252e4be..2f6a760e5f21 100644 --- a/drivers/net/sun3_82586.c +++ b/drivers/net/sun3_82586.c | |||
@@ -413,7 +413,7 @@ static int init586(struct net_device *dev) | |||
413 | volatile struct iasetup_cmd_struct *ias_cmd; | 413 | volatile struct iasetup_cmd_struct *ias_cmd; |
414 | volatile struct tdr_cmd_struct *tdr_cmd; | 414 | volatile struct tdr_cmd_struct *tdr_cmd; |
415 | volatile struct mcsetup_cmd_struct *mc_cmd; | 415 | volatile struct mcsetup_cmd_struct *mc_cmd; |
416 | struct dev_mc_list *dmi=dev->mc_list; | 416 | struct dev_mc_list *dmi; |
417 | int num_addrs=netdev_mc_count(dev); | 417 | int num_addrs=netdev_mc_count(dev); |
418 | 418 | ||
419 | ptr = (void *) ((char *)p->scb + sizeof(struct scb_struct)); | 419 | ptr = (void *) ((char *)p->scb + sizeof(struct scb_struct)); |
@@ -536,8 +536,10 @@ static int init586(struct net_device *dev) | |||
536 | mc_cmd->cmd_link = 0xffff; | 536 | mc_cmd->cmd_link = 0xffff; |
537 | mc_cmd->mc_cnt = swab16(num_addrs * 6); | 537 | mc_cmd->mc_cnt = swab16(num_addrs * 6); |
538 | 538 | ||
539 | for(i=0;i<num_addrs;i++,dmi=dmi->next) | 539 | i = 0; |
540 | memcpy((char *) mc_cmd->mc_list[i], dmi->dmi_addr,6); | 540 | netdev_for_each_mc_addr(dmi, dev) |
541 | memcpy((char *) mc_cmd->mc_list[i++], | ||
542 | dmi->dmi_addr, ETH_ALEN); | ||
541 | 543 | ||
542 | p->scb->cbl_offset = make16(mc_cmd); | 544 | p->scb->cbl_offset = make16(mc_cmd); |
543 | p->scb->cmd_cuc = CUC_START; | 545 | p->scb->cmd_cuc = CUC_START; |