1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 6293592635be..11f7ebedcde5 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1553,7 +1553,7 @@ static void sis900_tx_timeout(struct net_device *net_dev)
 
         spin_unlock_irqrestore(&sis_priv->lock, flags);
 
-        net_dev->trans_start = jiffies;
+        net_dev->trans_start = jiffies; /* prevent tx timeout */
 
         /* load Transmit Descriptor Register */
         outl(sis_priv->tx_ring_dma, ioaddr + txdp);
@@ -1623,8 +1623,6 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
 
         spin_unlock_irqrestore(&sis_priv->lock, flags);
 
-        net_dev->trans_start = jiffies;
-
         if (netif_msg_tx_queued(sis_priv))
                 printk(KERN_DEBUG "%s: Queued Tx packet at %p size %d "
                        "to slot %d.\n",