diff options
Diffstat (limited to 'drivers/net/tulip/winbond-840.c')
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 18c8cedf4cac..60a87542f8f0 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -969,7 +969,7 @@ static void tx_timeout(struct net_device *dev) | |||
969 | enable_irq(dev->irq); | 969 | enable_irq(dev->irq); |
970 | 970 | ||
971 | netif_wake_queue(dev); | 971 | netif_wake_queue(dev); |
972 | dev->trans_start = jiffies; | 972 | dev->trans_start = jiffies; /* prevent tx timeout */ |
973 | np->stats.tx_errors++; | 973 | np->stats.tx_errors++; |
974 | return; | 974 | return; |
975 | } | 975 | } |
@@ -1055,8 +1055,6 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1055 | } | 1055 | } |
1056 | spin_unlock_irq(&np->lock); | 1056 | spin_unlock_irq(&np->lock); |
1057 | 1057 | ||
1058 | dev->trans_start = jiffies; | ||
1059 | |||
1060 | if (debug > 4) { | 1058 | if (debug > 4) { |
1061 | printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d\n", | 1059 | printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d\n", |
1062 | dev->name, np->cur_tx, entry); | 1060 | dev->name, np->cur_tx, entry); |