1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c
index 8b28c89a9a77..151312342243 100644
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/sun3_82586.c
@@ -412,7 +412,7 @@ static int init586(struct net_device *dev)
         volatile struct iasetup_cmd_struct *ias_cmd;
         volatile struct tdr_cmd_struct *tdr_cmd;
         volatile struct mcsetup_cmd_struct *mc_cmd;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         int num_addrs=netdev_mc_count(dev);
 
         ptr = (void *) ((char *)p->scb + sizeof(struct scb_struct));
@@ -536,9 +536,9 @@ static int init586(struct net_device *dev)
                 mc_cmd->mc_cnt = swab16(num_addrs * 6);
 
                 i = 0;
-                netdev_for_each_mc_addr(dmi, dev)
+                netdev_for_each_mc_addr(ha, dev)
                         memcpy((char *) mc_cmd->mc_list[i++],
-                               dmi->dmi_addr, ETH_ALEN);
+                               ha->addr, ETH_ALEN);
 
                 p->scb->cbl_offset = make16(mc_cmd);
                 p->scb->cmd_cuc = CUC_START;
@@ -985,7 +985,7 @@ static void sun3_82586_timeout(struct net_device *dev)
                 p->scb->cmd_cuc = CUC_START;
                 sun3_attn586();
                 WAIT_4_SCB_CMD();
-                dev->trans_start = jiffies;
+                dev->trans_start = jiffies; /* prevent tx timeout */
                 return 0;
         }
 #endif
@@ -998,7 +998,7 @@ static void sun3_82586_timeout(struct net_device *dev)
                 sun3_82586_close(dev);
                 sun3_82586_open(dev);
         }
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
 }
 
 /******************************************************
@@ -1062,7 +1062,6 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)
                         }
 
                         sun3_attn586();
-                        dev->trans_start = jiffies;
                         if(!i)
                                 dev_kfree_skb(skb);
                         WAIT_4_SCB_CMD();
@@ -1082,7 +1081,6 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)
                 p->xmit_cmds[0]->cmd_status = p->nop_cmds[next_nop]->cmd_status = 0;
 
                 p->nop_cmds[p->nop_point]->cmd_link = make16((p->xmit_cmds[0]));
-                dev->trans_start = jiffies;
                 p->nop_point = next_nop;
                 dev_kfree_skb(skb);
 #       endif
@@ -1097,7 +1095,6 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)
                 p->nop_cmds[next_nop]->cmd_status = 0;
 
                 p->nop_cmds[p->xmit_count]->cmd_link = make16((p->xmit_cmds[p->xmit_count]));
-                dev->trans_start = jiffies;
                 p->xmit_count = next_nop;
 
                 {