net: convert multiple drivers to use netdev_for_each_mc_addr, part5 V2

[safe/jmp/linux-2.6] / drivers / net / ni52.c

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index bd0ac69..05c29c2 100644 (file)
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -284,7 +284,7 @@ static int ni52_open(struct net_device *dev)
        startrecv586(dev);
        ni_enaint();
 
-       ret = request_irq(dev->irq, &ni52_interrupt, 0, dev->name, dev);
+       ret = request_irq(dev->irq, ni52_interrupt, 0, dev->name, dev);
        if (ret) {
                ni_reset586();
                return ret;
@@ -477,8 +477,8 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr)
        for (i = 0; i < ETH_ALEN; i++)
                dev->dev_addr[i] = inb(dev->base_addr+i);
 
-       if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1
-                || dev->dev_addr[2] != NI52_ADDR2) {
+       if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1 ||
+           dev->dev_addr[2] != NI52_ADDR2) {
                retval = -ENODEV;
                goto out;
        }
@@ -596,8 +596,8 @@ static int init586(struct net_device *dev)
        struct iasetup_cmd_struct __iomem *ias_cmd;
        struct tdr_cmd_struct __iomem *tdr_cmd;
        struct mcsetup_cmd_struct __iomem *mc_cmd;
-       struct dev_mc_list *dmi = dev->mc_list;
-       int num_addrs = dev->mc_count;
+       struct dev_mc_list *dmi;
+       int num_addrs = netdev_mc_count(dev);
 
        ptr = p->scb + 1;
 
@@ -615,10 +615,10 @@ static int init586(struct net_device *dev)
        /* addr_len |!src_insert |pre-len |loopback */
        writeb(0x2e, &cfg_cmd->adr_len);
        writeb(0x00, &cfg_cmd->priority);
-       writeb(0x60, &cfg_cmd->ifs);;
+       writeb(0x60, &cfg_cmd->ifs);
        writeb(0x00, &cfg_cmd->time_low);
        writeb(0xf2, &cfg_cmd->time_high);
-       writeb(0x00, &cfg_cmd->promisc);;
+       writeb(0x00, &cfg_cmd->promisc);
        if (dev->flags & IFF_ALLMULTI) {
                int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6;
                if (num_addrs > len) {
@@ -724,9 +724,9 @@ static int init586(struct net_device *dev)
                writew(0xffff, &mc_cmd->cmd_link);
                writew(num_addrs * 6, &mc_cmd->mc_cnt);
 
-               for (i = 0; i < num_addrs; i++, dmi = dmi->next)
-                       memcpy_toio(mc_cmd->mc_list[i],
-                                                       dmi->dmi_addr, 6);
+               i = 0;
+               netdev_for_each_mc_addr(dmi, dev)
+                       memcpy_toio(mc_cmd->mc_list[i++], dmi->dmi_addr, 6);
 
                writew(make16(mc_cmd), &p->scb->cbl_offset);
                writeb(CUC_START, &p->scb->cmd_cuc);