Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index cb0b730799ba..1719079cc498 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -99,7 +99,6 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/mca-legacy.h>
@@ -288,7 +287,7 @@ static int elmc_open(struct net_device *dev)
 
         elmc_id_attn586();      /* disable interrupts */
 
-        ret = request_irq(dev->irq, &elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+        ret = request_irq(dev->irq, elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                           dev->name, dev);
         if (ret) {
                 pr_err("%s: couldn't get irq %d\n", dev->name, dev->irq);
@@ -625,8 +624,8 @@ static int init586(struct net_device *dev)
         volatile struct iasetup_cmd_struct *ias_cmd;
         volatile struct tdr_cmd_struct *tdr_cmd;
         volatile struct mcsetup_cmd_struct *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 = (void *) ((char *) p->scb + sizeof(struct scb_struct));
 
@@ -771,7 +770,7 @@ static int init586(struct net_device *dev)
          * Multicast setup
          */
 
-        if (dev->mc_count) {
+        if (num_addrs) {
                 /* I don't understand this: do we really need memory after the init? */
                 int len = ((char *) p->iscp - (char *) ptr - 8) / 6;
                 if (len <= 0) {
@@ -787,10 +786,9 @@ static int init586(struct net_device *dev)
                         mc_cmd->cmd_cmd = CMD_MCSETUP | CMD_LAST;
                         mc_cmd->cmd_link = 0xffff;
                         mc_cmd->mc_cnt = num_addrs * 6;
-                        for (i = 0; i < num_addrs; i++) {
-                                memcpy((char *) mc_cmd->mc_list[i], dmi->dmi_addr, 6);
-                                dmi = dmi->next;
-                        }
+                        i = 0;
+                        netdev_for_each_mc_addr(dmi, dev)
+                                memcpy((char *) mc_cmd->mc_list[i++], dmi->dmi_addr, 6);
                         p->scb->cbl_offset = make16(mc_cmd);
                         p->scb->cmd = CUC_START;
                         elmc_id_attn586();