Merge branch 'origin' into devel-stable

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 16c91910d6c1..966de5d69521 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -958,18 +958,17 @@ static void veth_set_multicast_list(struct net_device *dev)
         write_lock_irqsave(&port->mcast_gate, flags);
 
         if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI) ||
-                        (dev->mc_count > VETH_MAX_MCAST)) {
+                        (netdev_mc_count(dev) > VETH_MAX_MCAST)) {
                 port->promiscuous = 1;
         } else {
-                struct dev_mc_list *dmi = dev->mc_list;
-                int i;
+                struct dev_mc_list *dmi;
 
                 port->promiscuous = 0;
 
                 /* Update table */
                 port->num_mcast = 0;
 
-                for (i = 0; i < dev->mc_count; i++) {
+                netdev_for_each_mc_addr(dmi, dev) {
                         u8 *addr = dmi->dmi_addr;
                         u64 xaddr = 0;
 
@@ -978,7 +977,6 @@ static void veth_set_multicast_list(struct net_device *dev)
                                 port->mcast_addr[port->num_mcast] = xaddr;
                                 port->num_mcast++;
                         }
-                        dmi = dmi->next;
                 }
         }