diff options
Diffstat (limited to 'drivers/net/sonic.c')
| -rw-r--r-- | drivers/net/sonic.c | 4 | 
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c index e5d67327d70..26e25d7f582 100644 --- a/drivers/net/sonic.c +++ b/drivers/net/sonic.c @@ -174,7 +174,7 @@ static void sonic_tx_timeout(struct net_device *dev)  	/* Try to restart the adaptor. */  	sonic_init(dev);  	lp->stats.tx_errors++; -	dev->trans_start = jiffies; +	dev->trans_start = jiffies; /* prevent tx timeout */  	netif_wake_queue(dev);  } @@ -263,8 +263,6 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)  	SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP); -	dev->trans_start = jiffies; -  	return NETDEV_TX_OK;  }  |