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

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 7a3bdac84abe..744c1928dfca 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -849,7 +849,7 @@ static int depca_open(struct net_device *dev)
 
         depca_dbg_open(dev);
 
-        if (request_irq(dev->irq, &depca_interrupt, 0, lp->adapter_name, dev)) {
+        if (request_irq(dev->irq, depca_interrupt, 0, lp->adapter_name, dev)) {
                 printk("depca_open(): Requested IRQ%d is busy\n", dev->irq);
                 status = -EAGAIN;
         } else {
@@ -1272,7 +1272,7 @@ static void set_multicast_list(struct net_device *dev)
 static void SetMulticastFilter(struct net_device *dev)
 {
         struct depca_private *lp = netdev_priv(dev);
-        struct dev_mc_list *dmi = dev->mc_list;
+        struct dev_mc_list *dmi;
         char *addrs;
         int i, j, bit, byte;
         u16 hashcode;
@@ -1287,9 +1287,8 @@ static void SetMulticastFilter(struct net_device *dev)
                         lp->init_block.mcast_table[i] = 0;
                 }
                 /* Add multicast addresses */
-                for (i = 0; i < dev->mc_count; i++) {   /* for each address in the list */
+                netdev_for_each_mc_addr(dmi, dev) {
                         addrs = dmi->dmi_addr;
-                        dmi = dmi->next;
                         if ((*addrs & 0x01) == 1) {     /* multicast address? */
                                 crc = ether_crc(ETH_ALEN, addrs);
                                 hashcode = (crc & 1);   /* hashcode is 6 LSb of CRC ... */