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

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c
index 2f1eaaf7a727..8b28c89a9a77 100644
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/sun3_82586.c
@@ -33,7 +33,6 @@ static int fifo=0x8;	/* don't change */
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -191,7 +190,7 @@ static int sun3_82586_open(struct net_device *dev)
         startrecv586(dev);
         sun3_enaint();
 
-        ret = request_irq(dev->irq, &sun3_82586_interrupt,0,dev->name,dev);
+        ret = request_irq(dev->irq, sun3_82586_interrupt,0,dev->name,dev);
         if (ret)
         {
                 sun3_reset586();
@@ -413,8 +412,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));
 
@@ -536,8 +535,10 @@ static int init586(struct net_device *dev)
                 mc_cmd->cmd_link = 0xffff;
                 mc_cmd->mc_cnt = swab16(num_addrs * 6);
 
-                for(i=0;i<num_addrs;i++,dmi=dmi->next)
-                        memcpy((char *) mc_cmd->mc_list[i], dmi->dmi_addr,6);
+                i = 0;
+                netdev_for_each_mc_addr(dmi, dev)
+                        memcpy((char *) mc_cmd->mc_list[i++],
+                               dmi->dmi_addr, ETH_ALEN);
 
                 p->scb->cbl_offset = make16(mc_cmd);
                 p->scb->cmd_cuc = CUC_START;