aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/epic100.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/epic100.c')
-rw-r--r--drivers/net/epic100.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 8b5a203d3aa2..a48da2dc907f 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -908,7 +908,7 @@ static void epic_tx_timeout(struct net_device *dev)
908 outl(TxQueued, dev->base_addr + COMMAND); 908 outl(TxQueued, dev->base_addr + COMMAND);
909 } 909 }
910 910
911 dev->trans_start = jiffies; 911 dev->trans_start = jiffies; /* prevent tx timeout */
912 ep->stats.tx_errors++; 912 ep->stats.tx_errors++;
913 if (!ep->tx_full) 913 if (!ep->tx_full)
914 netif_wake_queue(dev); 914 netif_wake_queue(dev);
@@ -1006,7 +1006,6 @@ static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev)
1006 /* Trigger an immediate transmit demand. */ 1006 /* Trigger an immediate transmit demand. */
1007 outl(TxQueued, dev->base_addr + COMMAND); 1007 outl(TxQueued, dev->base_addr + COMMAND);
1008 1008
1009 dev->trans_start = jiffies;
1010 if (debug > 4) 1009 if (debug > 4)
1011 printk(KERN_DEBUG "%s: Queued Tx packet size %d to slot %d, " 1010 printk(KERN_DEBUG "%s: Queued Tx packet size %d to slot %d, "
1012 "flag %2.2x Tx status %8.8x.\n", 1011 "flag %2.2x Tx status %8.8x.\n",