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 9250bf6573e..2a17b503fea 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -1905,7 +1905,7 @@ static void ns_tx_timeout(struct net_device *dev)  	spin_unlock_irq(&np->lock);  	enable_irq(dev->irq); -	dev->trans_start = jiffies; +	dev->trans_start = jiffies; /* prevent tx timeout */  	np->stats.tx_errors++;  	netif_wake_queue(dev);  } @@ -2119,8 +2119,6 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)  	}  	spin_unlock_irqrestore(&np->lock, flags); -	dev->trans_start = jiffies; -  	if (netif_msg_tx_queued(np)) {  		printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n",  			dev->name, np->cur_tx, entry);  |