From: Ayaz Abdulla <aabdulla@nvidia.com>
Date: Fri, 23 Mar 2007 10:50:02 +0000 (-0500)
Subject: forcedeth: fix tx timeout
X-Git-Tag: v2.6.21-rc6~80^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3ba4d093fe8a26f5f2da94411bf8732fa6e9da86;p=linux-2.6-omap-h63xx.git

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 <aabdulla@nvidia.com>

Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index ae4e6f9375c..d04214e4e58 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -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);