Skip to content

Commit

Permalink
forcedeth: fix tx timeout
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ayaz Abdulla authored and Jeff Garzik committed Mar 28, 2007
1 parent fcc5f26 commit 3ba4d09
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/forcedeth.c
Original file line number Diff line number Diff line change
Expand Up @@ -2050,9 +2050,10 @@ static void nv_tx_timeout(struct net_device *dev)
nv_drain_tx(dev);
nv_init_tx(dev);
setup_hw_rings(dev, NV_SETUP_TX_RING);
netif_wake_queue(dev);
}

netif_wake_queue(dev);

/* 4) restart tx engine */
nv_start_tx(dev);
spin_unlock_irq(&np->lock);
Expand Down

0 comments on commit 3ba4d09

Please sign in to comment.