diff options
Diffstat (limited to 'drivers/net/ns83820.c')
-rw-r--r-- | drivers/net/ns83820.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index d531614a90b5..940962ae8f23 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
@@ -1204,9 +1204,7 @@ again: | |||
1204 | if (stopped && (dev->tx_done_idx != tx_done_idx) && start_tx_okay(dev)) | 1204 | if (stopped && (dev->tx_done_idx != tx_done_idx) && start_tx_okay(dev)) |
1205 | netif_start_queue(ndev); | 1205 | netif_start_queue(ndev); |
1206 | 1206 | ||
1207 | /* set the transmit start time to catch transmit timeouts */ | 1207 | return NETDEV_TX_OK; |
1208 | ndev->trans_start = jiffies; | ||
1209 | return 0; | ||
1210 | } | 1208 | } |
1211 | 1209 | ||
1212 | static void ns83820_update_stats(struct ns83820 *dev) | 1210 | static void ns83820_update_stats(struct ns83820 *dev) |
@@ -1626,7 +1624,7 @@ static void ns83820_tx_watch(unsigned long data) | |||
1626 | ); | 1624 | ); |
1627 | #endif | 1625 | #endif |
1628 | 1626 | ||
1629 | if (time_after(jiffies, ndev->trans_start + 1*HZ) && | 1627 | if (time_after(jiffies, dev_trans_start(ndev) + 1*HZ) && |
1630 | dev->tx_done_idx != dev->tx_free_idx) { | 1628 | dev->tx_done_idx != dev->tx_free_idx) { |
1631 | printk(KERN_DEBUG "%s: ns83820_tx_watch: %u %u %d\n", | 1629 | printk(KERN_DEBUG "%s: ns83820_tx_watch: %u %u %d\n", |
1632 | ndev->name, | 1630 | ndev->name, |