Commit:     3ba4d093fe8a26f5f2da94411bf8732fa6e9da86
Parent:     fcc5f2665c81e087fb95143325ed769a41128d50
Author:     Ayaz Abdulla <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 23 05:50:02 2007 -0500
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Wed Mar 28 02:18:51 2007 -0400

    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: Ayaz Abdulla <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/net/forcedeth.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index ae4e6f9..d04214e 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2050,9 +2050,10 @@ static void nv_tx_timeout(struct net_device *dev)
                setup_hw_rings(dev, NV_SETUP_TX_RING);
-               netif_wake_queue(dev);
+       netif_wake_queue(dev);
        /* 4) restart tx engine */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to