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

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 536cf7e06bfd..ed7865a0b5b2 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -11,7 +11,6 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -25,6 +24,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/gfp.h>
 
 #include <asm/auxio.h>
 #include <asm/byteorder.h>
@@ -919,7 +919,7 @@ static int bigmac_open(struct net_device *dev)
         struct bigmac *bp = netdev_priv(dev);
         int ret;
 
-        ret = request_irq(dev->irq, &bigmac_interrupt, IRQF_SHARED, dev->name, bp);
+        ret = request_irq(dev->irq, bigmac_interrupt, IRQF_SHARED, dev->name, bp);
         if (ret) {
                 printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq);
                 return ret;
@@ -999,7 +999,7 @@ static void bigmac_set_multicast(struct net_device *dev)
 {
         struct bigmac *bp = netdev_priv(dev);
         void __iomem *bregs = bp->bregs;
-        struct dev_mc_list *dmi = dev->mc_list;
+        struct dev_mc_list *dmi;
         char *addrs;
         int i;
         u32 tmp, crc;
@@ -1013,7 +1013,7 @@ static void bigmac_set_multicast(struct net_device *dev)
         while ((sbus_readl(bregs + BMAC_RXCFG) & BIGMAC_RXCFG_ENABLE) != 0)
                 udelay(20);
 
-        if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 64)) {
+        if ((dev->flags & IFF_ALLMULTI) || (netdev_mc_count(dev) > 64)) {
                 sbus_writel(0xffff, bregs + BMAC_HTABLE0);
                 sbus_writel(0xffff, bregs + BMAC_HTABLE1);
                 sbus_writel(0xffff, bregs + BMAC_HTABLE2);
@@ -1028,9 +1028,8 @@ static void bigmac_set_multicast(struct net_device *dev)
                 for (i = 0; i < 4; i++)
                         hash_table[i] = 0;
 
-                for (i = 0; i < dev->mc_count; i++) {
+                netdev_for_each_mc_addr(dmi, dev) {
                         addrs = dmi->dmi_addr;
-                        dmi = dmi->next;
 
                         if (!(*addrs & 1))
                                 continue;