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 e5d67327d707..26e25d7f5829 100644 --- a/drivers/net/sonic.c +++ b/drivers/net/sonic.c | |||
@@ -174,7 +174,7 @@ static void sonic_tx_timeout(struct net_device *dev) | |||
174 | /* Try to restart the adaptor. */ | 174 | /* Try to restart the adaptor. */ |
175 | sonic_init(dev); | 175 | sonic_init(dev); |
176 | lp->stats.tx_errors++; | 176 | lp->stats.tx_errors++; |
177 | dev->trans_start = jiffies; | 177 | dev->trans_start = jiffies; /* prevent tx timeout */ |
178 | netif_wake_queue(dev); | 178 | netif_wake_queue(dev); |
179 | } | 179 | } |
180 | 180 | ||
@@ -263,8 +263,6 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
263 | 263 | ||
264 | SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP); | 264 | SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP); |
265 | 265 | ||
266 | dev->trans_start = jiffies; | ||
267 | |||
268 | return NETDEV_TX_OK; | 266 | return NETDEV_TX_OK; |
269 | } | 267 | } |
270 | 268 | ||