1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index ede5b2436f22..4eb67aed68dd 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -564,7 +564,6 @@ static void mdio_write(void __iomem *ioaddr, int phy_id, int location, int value
         for (i = 10000; i >= 0; i--)
                 if ((ioread16(ioaddr + MII_Status) & 1) == 0)
                         break;
-        return;
 }
 
 
@@ -1299,25 +1298,25 @@ static void set_rx_mode(struct net_device *dev)
                 /* Too many to filter well, or accept all multicasts. */
                 iowrite16(0x000B, ioaddr + AddrMode);
         } else if (!netdev_mc_empty(dev)) { /* Must use the multicast hash table. */
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
                 u16 hash_table[4];
                 int i;
 
                 memset(hash_table, 0, sizeof(hash_table));
-                netdev_for_each_mc_addr(mclist, dev) {
+                netdev_for_each_mc_addr(ha, dev) {
                         unsigned int bit;
 
                         /* Due to a bug in the early chip versions, multiple filter
                            slots must be set for each address. */
                         if (yp->drv_flags & HasMulticastBug) {
-                                bit = (ether_crc_le(3, mclist->dmi_addr) >> 3) & 0x3f;
+                                bit = (ether_crc_le(3, ha->addr) >> 3) & 0x3f;
                                 hash_table[bit >> 4] |= (1 << bit);
-                                bit = (ether_crc_le(4, mclist->dmi_addr) >> 3) & 0x3f;
+                                bit = (ether_crc_le(4, ha->addr) >> 3) & 0x3f;
                                 hash_table[bit >> 4] |= (1 << bit);
-                                bit = (ether_crc_le(5, mclist->dmi_addr) >> 3) & 0x3f;
+                                bit = (ether_crc_le(5, ha->addr) >> 3) & 0x3f;
                                 hash_table[bit >> 4] |= (1 << bit);
                         }
-                        bit = (ether_crc_le(6, mclist->dmi_addr) >> 3) & 0x3f;
+                        bit = (ether_crc_le(6, ha->addr) >> 3) & 0x3f;
                         hash_table[bit >> 4] |= (1 << bit);
                 }
                 /* Copy the hash table to the chip. */