Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[sfrench/cifs-2.6.git] / drivers / staging / et131x / et131x_netdev.c

diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c
index ab047f2ff72cd10e1a3a17e34803f4e8f04b1893..106d548982c45717b9c2dbaa240b7cc0a7edd52c 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);
@@ -426,33 +426,29 @@ void et131x_multicast(struct net_device *netdev)
         * accordingly
         */
 
-       if (netdev->flags & IFF_PROMISC) {
+       if (netdev->flags & IFF_PROMISC)
                adapter->PacketFilter |= ET131X_PACKET_TYPE_PROMISCUOUS;
-       } else {
+       else
                adapter->PacketFilter &= ~ET131X_PACKET_TYPE_PROMISCUOUS;
-       }
 
-       if (netdev->flags & IFF_ALLMULTI) {
+       if (netdev->flags & IFF_ALLMULTI)
                adapter->PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST;
-       }
 
-       if (netdev_mc_count(netdev) > NIC_MAX_MCAST_LIST) {
+       if (netdev_mc_count(netdev) > NIC_MAX_MCAST_LIST)
                adapter->PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST;
-       }
 
        if (netdev_mc_count(netdev) < 1) {
                adapter->PacketFilter &= ~ET131X_PACKET_TYPE_ALL_MULTICAST;
                adapter->PacketFilter &= ~ET131X_PACKET_TYPE_MULTICAST;
-       } else {
+       } else
                adapter->PacketFilter |= ET131X_PACKET_TYPE_MULTICAST;
-       }
 
        /* 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;