1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index a8f0512bad38..f142cc21e453 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -525,7 +525,7 @@ static inline int lance_reset (struct net_device *dev)
         load_csrs (lp);
 
         lance_init_ring (dev);
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         netif_start_queue(dev);
 
         status = init_restart_lance (lp);
@@ -588,7 +588,6 @@ static netdev_tx_t lance_start_xmit (struct sk_buff *skb,
 
         /* Kick the lance: transmit now */
         ll->rdp = LE_C0_INEA | LE_C0_TDMD;
-        dev->trans_start = jiffies;
         dev_kfree_skb (skb);
 
         local_irq_restore(flags);
@@ -602,7 +601,7 @@ static void lance_load_multicast (struct net_device *dev)
         struct lance_private *lp = netdev_priv(dev);
         volatile struct lance_init_block *ib = lp->init_block;
         volatile u16 *mcast_table = (u16 *)&ib->filter;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         char *addrs;
         u32 crc;
 
@@ -617,8 +616,8 @@ static void lance_load_multicast (struct net_device *dev)
         ib->filter [1] = 0;
 
         /* Add addresses */
-        netdev_for_each_mc_addr(dmi, dev) {
-                addrs = dmi->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+                addrs = ha->addr;
 
                 /* multicast address? */
                 if (!(*addrs & 1))
@@ -628,7 +627,6 @@ static void lance_load_multicast (struct net_device *dev)
                 crc = crc >> 26;
                 mcast_table [crc >> 4] |= 1 << (crc & 0xf);
         }
-        return;
 }
 
 static void lance_set_multicast (struct net_device *dev)