1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 98dbf6cc1d68..608b279b921b 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -626,7 +626,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
                 iowrite32(MDIO_EnbIn | MDIO_ShiftClk, mdio_addr);
                 mdio_delay(mdio_addr);
         }
-        return;
 }
 
 
@@ -969,9 +968,8 @@ static void tx_timeout(struct net_device *dev)
         enable_irq(dev->irq);
 
         netif_wake_queue(dev);
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         np->stats.tx_errors++;
-        return;
 }
 
 /* Initialize the Rx and Tx rings, along with various 'dev' bits. */
@@ -1055,8 +1053,6 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
         }
         spin_unlock_irq(&np->lock);
 
-        dev->trans_start = jiffies;
-
         if (debug > 4) {
                 printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d\n",
                        dev->name, np->cur_tx, entry);
@@ -1366,13 +1362,15 @@ static u32 __set_rx_mode(struct net_device *dev)
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys;
         } else {
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                netdev_for_each_mc_addr(mclist, dev) {
-                        int filterbit = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26) ^ 0x3F;
-                        filterbit &= 0x3f;
-                        mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
+                netdev_for_each_mc_addr(ha, dev) {
+                        int filbit;
+
+                        filbit = (ether_crc(ETH_ALEN, ha->addr) >> 26) ^ 0x3F;
+                        filbit &= 0x3f;
+                        mc_filter[filbit >> 5] |= 1 << (filbit & 31);
                 }
                 rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys;
         }