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

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index 934a12012829..3f2f7843aa4e 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -64,7 +64,6 @@ static const char version[] =
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
@@ -434,18 +433,18 @@ static void smc_shutdown( int ioaddr )
 */
 
 
-static void smc_setmulticast( int ioaddr, int count, struct dev_mc_list * addrs ) {
+static void smc_setmulticast(int ioaddr, struct net_device *dev)
+{
         int                     i;
         unsigned char           multicast_table[ 8 ];
-        struct dev_mc_list      * cur_addr;
+        struct dev_mc_list *cur_addr;
         /* table for flipping the order of 3 bits */
         unsigned char invert3[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
 
         /* start with a table of all zeros: reject all */
         memset( multicast_table, 0, sizeof( multicast_table ) );
 
-        cur_addr = addrs;
-        for ( i = 0; i < count ; i ++, cur_addr = cur_addr->next  ) {
+        netdev_for_each_mc_addr(cur_addr, dev) {
                 int position;
 
                 /* do we have a pointer here? */
@@ -1050,7 +1049,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
         memset(netdev_priv(dev), 0, sizeof(struct smc_local));
 
         /* Grab the IRQ */
-        retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev);
+        retval = request_irq(dev->irq, smc_interrupt, 0, DRV_NAME, dev);
         if (retval) {
                 printk("%s: unable to get IRQ %d (irqval=%d).\n", DRV_NAME,
                         dev->irq, retval);
@@ -1542,7 +1541,7 @@ static void smc_set_multicast_list(struct net_device *dev)
         /* We just get all multicast packets even if we only want them
          . from one source.  This will be changed at some future
          . point. */
-        else if (dev->mc_count )  {
+        else if (!netdev_mc_empty(dev)) {
                 /* support hardware multicasting */
 
                 /* be sure I get rid of flags I might have set */
@@ -1550,7 +1549,7 @@ static void smc_set_multicast_list(struct net_device *dev)
                         ioaddr + RCR );
                 /* NOTE: this has to set the bank, so make sure it is the
                    last thing called.  The bank is set to zero at the top */
-                smc_setmulticast( ioaddr, dev->mc_count, dev->mc_list );
+                smc_setmulticast(ioaddr, dev);
         }
         else  {
                 outw( inw( ioaddr + RCR ) & ~(RCR_PROMISC | RCR_ALMUL),