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

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 691b81eb0f46..6be8b098b8b4 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -32,6 +32,7 @@
 #include <linux/kernel.h>
 #include <linux/phy.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <mach/npe.h>
 #include <mach/qmgr.h>
 
@@ -322,7 +323,7 @@ static int ixp4xx_mdio_write(struct mii_bus *bus, int phy_id, int location,
         ret = ixp4xx_mdio_cmd(bus, phy_id, location, 1, val);
         spin_unlock_irqrestore(&mdio_lock, flags);
 #if DEBUG_MDIO
-        printk(KERN_DEBUG "%s #%i: MII read [%i] <- 0x%X, err = %i\n",
+        printk(KERN_DEBUG "%s #%i: MII write [%i] <- 0x%X, err = %i\n",
                bus->name, phy_id, location, val, ret);
 #endif
         return ret;
@@ -735,22 +736,25 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
 static void eth_set_mcast_list(struct net_device *dev)
 {
         struct port *port = netdev_priv(dev);
-        struct dev_mc_list *mclist = dev->mc_list;
+        struct dev_mc_list *mclist;
         u8 diffs[ETH_ALEN], *addr;
-        int cnt = dev->mc_count, i;
+        int i;
 
-        if ((dev->flags & IFF_PROMISC) || !mclist || !cnt) {
+        if ((dev->flags & IFF_PROMISC) || netdev_mc_empty(dev)) {
                 __raw_writel(DEFAULT_RX_CNTRL0 & ~RX_CNTRL0_ADDR_FLTR_EN,
                              &port->regs->rx_control[0]);
                 return;
         }
 
         memset(diffs, 0, ETH_ALEN);
-        addr = mclist->dmi_addr; /* first MAC address */
 
-        while (--cnt && (mclist = mclist->next))
+        addr = NULL;
+        netdev_for_each_mc_addr(mclist, dev) {
+                if (!addr)
+                        addr = mclist->dmi_addr; /* first MAC address */
                 for (i = 0; i < ETH_ALEN; i++)
                         diffs[i] |= addr[i] ^ mclist->dmi_addr[i];
+        }
 
         for (i = 0; i < ETH_ALEN; i++) {
                 __raw_writel(addr[i], &port->regs->mcast_addr[i]);