Merge staging-next tree into Linus's latest version

[pandora-kernel.git] / drivers / staging / et131x / et131x_netdev.c

diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c
index 535a9d0..106d548 100644 (file)
--- a/drivers/staging/et131x/et131x_netdev.c
+++ b/drivers/staging/et131x/et131x_netdev.c
@@ -404,7 +404,7 @@ void et131x_multicast(struct net_device *netdev)
        struct et131x_adapter *adapter = netdev_priv(netdev);
        uint32_t PacketFilter = 0;
        unsigned long flags;
-       struct dev_mc_list *mclist;
+       struct netdev_hw_addr *ha;
        int i;
 
        spin_lock_irqsave(&adapter->Lock, flags);
@@ -445,10 +445,10 @@ void et131x_multicast(struct net_device *netdev)
 
        /* Set values in the private adapter struct */
        i = 0;
-       netdev_for_each_mc_addr(mclist, netdev) {
+       netdev_for_each_mc_addr(ha, netdev) {
                if (i == NIC_MAX_MCAST_LIST)
                        break;
-               memcpy(adapter->MCList[i++], mclist->dmi_addr, ETH_ALEN);
+               memcpy(adapter->MCList[i++], ha->addr, ETH_ALEN);
        }
        adapter->MCAddressCount = i;