aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c59x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/3c59x.c')
-rw-r--r--drivers/net/3c59x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 97525307ed27..dab2afac6ddc 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1917,7 +1917,7 @@ static void vortex_tx_timeout(struct net_device *dev)
1917 1917
1918 /* Issue Tx Enable */ 1918 /* Issue Tx Enable */
1919 iowrite16(TxEnable, ioaddr + EL3_CMD); 1919 iowrite16(TxEnable, ioaddr + EL3_CMD);
1920 dev->trans_start = jiffies; 1920 dev->trans_start = jiffies; /* prevent tx timeout */
1921 1921
1922 /* Switch to register set 7 for normal use. */ 1922 /* Switch to register set 7 for normal use. */
1923 EL3WINDOW(7); 1923 EL3WINDOW(7);
@@ -2063,7 +2063,6 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
2063 } 2063 }
2064 } 2064 }
2065 2065
2066 dev->trans_start = jiffies;
2067 2066
2068 /* Clear the Tx status stack. */ 2067 /* Clear the Tx status stack. */
2069 { 2068 {
@@ -2174,7 +2173,6 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
2174 } 2173 }
2175 iowrite16(DownUnstall, ioaddr + EL3_CMD); 2174 iowrite16(DownUnstall, ioaddr + EL3_CMD);
2176 spin_unlock_irqrestore(&vp->lock, flags); 2175 spin_unlock_irqrestore(&vp->lock, flags);
2177 dev->trans_start = jiffies;
2178 return NETDEV_TX_OK; 2176 return NETDEV_TX_OK;
2179} 2177}
2180 2178