1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 56e68db48861..dd8dc15556cb 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1050,7 +1050,7 @@ static void i596_tx_timeout (struct net_device *dev)
                 lp->last_restart = dev->stats.tx_packets;
         }
 
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         netif_wake_queue (dev);
 }
 
@@ -1060,7 +1060,6 @@ static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct tx_cmd *tx_cmd;
         struct i596_tbd *tbd;
         short length = skb->len;
-        dev->trans_start = jiffies;
 
         DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%p) called\n",
                                 dev->name, skb->len, skb->data));
@@ -1542,7 +1541,7 @@ static void set_multicast_list(struct net_device *dev)
         }
 
         if (!netdev_mc_empty(dev)) {
-                struct dev_mc_list *dmi;
+                struct netdev_hw_addr *ha;
                 unsigned char *cp;
                 struct mc_cmd *cmd;
 
@@ -1552,10 +1551,10 @@ static void set_multicast_list(struct net_device *dev)
                 cmd->cmd.command = CmdMulticastList;
                 cmd->mc_cnt = cnt * ETH_ALEN;
                 cp = cmd->mc_addrs;
-                netdev_for_each_mc_addr(dmi, dev) {
+                netdev_for_each_mc_addr(ha, dev) {
                         if (!cnt--)
                                 break;
-                        memcpy(cp, dmi->dmi_addr, ETH_ALEN);
+                        memcpy(cp, ha->addr, ETH_ALEN);
                         if (i596_debug > 1)
                                 DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %pM\n",
                                                 dev->name, cp));