forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forcedeth: fix tx timeout

Browse source 
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: Ayaz Abdulla <aabdulla@nvidia.com>

Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Ayaz Abdulla 2007-03-23 05:50:02 -05:00 • committed by Jeff Garzik
parent fcc5f2665c
commit 3ba4d093fe
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/forcedeth.c
View file

@ -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);