Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / net / pcmcia / smc91c92_cs.c

diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index ff7eb9116b6a94eb4cc86b93382dec84c40ba04e..ad2267646187dc48df2054ab666bdd056bce1884 100644 (file)
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1618,12 +1618,12 @@ static void set_rx_mode(struct net_device *dev)
        rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;
     else {
        if (!netdev_mc_empty(dev)) {
-           struct dev_mc_list *mc_addr;
+           struct netdev_hw_addr *ha;
 
-           netdev_for_each_mc_addr(mc_addr, dev) {
-               u_int position = ether_crc(6, mc_addr->dmi_addr);
+           netdev_for_each_mc_addr(ha, dev) {
+               u_int position = ether_crc(6, ha->addr);
 #ifndef final_version          /* Verify multicast address. */
-               if ((mc_addr->dmi_addr[0] & 1) == 0)
+               if ((ha->addr[0] & 1) == 0)
                    continue;
 #endif
                multicast_table[position >> 29] |= 1 << ((position >> 26) & 7);