Commit 3ba4d093 authored by Ayaz Abdulla's avatar Ayaz Abdulla Committed by Jeff Garzik

forcedeth: fix tx timeout

The tx timeout routine was waking the tx queue conditionally. However,
it must call it unconditionally since the dev_watchdog has halted the tx
queue before calling the timeout function.
Signed-Off-By: default avatarAyaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent fcc5f266
...@@ -2050,9 +2050,10 @@ static void nv_tx_timeout(struct net_device *dev) ...@@ -2050,9 +2050,10 @@ static void nv_tx_timeout(struct net_device *dev)
nv_drain_tx(dev); nv_drain_tx(dev);
nv_init_tx(dev); nv_init_tx(dev);
setup_hw_rings(dev, NV_SETUP_TX_RING); setup_hw_rings(dev, NV_SETUP_TX_RING);
netif_wake_queue(dev);
} }
netif_wake_queue(dev);
/* 4) restart tx engine */ /* 4) restart tx engine */
nv_start_tx(dev); nv_start_tx(dev);
spin_unlock_irq(&np->lock); spin_unlock_irq(&np->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment