1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index f7a8f707361e..9bddb5fa7a96 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -595,7 +595,7 @@ static int init586(struct net_device *dev)
         struct iasetup_cmd_struct __iomem *ias_cmd;
         struct tdr_cmd_struct __iomem *tdr_cmd;
         struct mcsetup_cmd_struct __iomem *mc_cmd;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         int num_addrs = netdev_mc_count(dev);
 
         ptr = p->scb + 1;
@@ -724,8 +724,8 @@ static int init586(struct net_device *dev)
                 writew(num_addrs * 6, &mc_cmd->mc_cnt);
 
                 i = 0;
-                netdev_for_each_mc_addr(dmi, dev)
-                        memcpy_toio(mc_cmd->mc_list[i++], dmi->dmi_addr, 6);
+                netdev_for_each_mc_addr(ha, dev)
+                        memcpy_toio(mc_cmd->mc_list[i++], ha->addr, 6);
 
                 writew(make16(mc_cmd), &p->scb->cbl_offset);
                 writeb(CUC_START, &p->scb->cmd_cuc);
@@ -1147,7 +1147,7 @@ static void ni52_timeout(struct net_device *dev)
                 writeb(CUC_START, &p->scb->cmd_cuc);
                 ni_attn586();
                 wait_for_scb_cmd(dev);
-                dev->trans_start = jiffies;
+                dev->trans_start = jiffies; /* prevent tx timeout */
                 return 0;
         }
 #endif
@@ -1165,7 +1165,7 @@ static void ni52_timeout(struct net_device *dev)
                 ni52_close(dev);
                 ni52_open(dev);
         }
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
 }
 
 /******************************************************
@@ -1218,7 +1218,6 @@ static netdev_tx_t ni52_send_packet(struct sk_buff *skb,
                         writeb(CUC_START, &p->scb->cmd_cuc);
                 }
                 ni_attn586();
-                dev->trans_start = jiffies;
                 if (!i)
                         dev_kfree_skb(skb);
                 wait_for_scb_cmd(dev);
@@ -1240,7 +1239,6 @@ static netdev_tx_t ni52_send_packet(struct sk_buff *skb,
         writew(0, &p->nop_cmds[next_nop]->cmd_status);
 
         writew(make16(p->xmit_cmds[0]), &p->nop_cmds[p->nop_point]->cmd_link);
-        dev->trans_start = jiffies;
         p->nop_point = next_nop;
         dev_kfree_skb(skb);
 #       endif
@@ -1256,7 +1254,6 @@ static netdev_tx_t ni52_send_packet(struct sk_buff *skb,
         writew(0, &p->nop_cmds[next_nop]->cmd_status);
         writew(make16(p->xmit_cmds[p->xmit_count]),
                                 &p->nop_cmds[p->xmit_count]->cmd_link);
-        dev->trans_start = jiffies;
         p->xmit_count = next_nop;
         {
                 unsigned long flags;