diff options
Diffstat (limited to 'drivers/net/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 9250bf6573ec..2a17b503feaa 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -1905,7 +1905,7 @@ static void ns_tx_timeout(struct net_device *dev) | |||
1905 | spin_unlock_irq(&np->lock); | 1905 | spin_unlock_irq(&np->lock); |
1906 | enable_irq(dev->irq); | 1906 | enable_irq(dev->irq); |
1907 | 1907 | ||
1908 | dev->trans_start = jiffies; | 1908 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1909 | np->stats.tx_errors++; | 1909 | np->stats.tx_errors++; |
1910 | netif_wake_queue(dev); | 1910 | netif_wake_queue(dev); |
1911 | } | 1911 | } |
@@ -2119,8 +2119,6 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) | |||
2119 | } | 2119 | } |
2120 | spin_unlock_irqrestore(&np->lock, flags); | 2120 | spin_unlock_irqrestore(&np->lock, flags); |
2121 | 2121 | ||
2122 | dev->trans_start = jiffies; | ||
2123 | |||
2124 | if (netif_msg_tx_queued(np)) { | 2122 | if (netif_msg_tx_queued(np)) { |
2125 | printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n", | 2123 | printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n", |
2126 | dev->name, np->cur_tx, entry); | 2124 | dev->name, np->cur_tx, entry); |