[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200703270547.l2R5lSTx008275@shell0.pdx.osdl.net>
Date: Mon, 26 Mar 2007 21:47:28 -0800
From: akpm@...ux-foundation.org
To: jeff@...zik.org
Cc: netdev@...r.kernel.org, akpm@...ux-foundation.org,
aabdulla@...dia.com
Subject: [patch 09/10] forcedeth: fix tx timeout
From: Ayaz Abdulla <aabdulla@...dia.com>
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@...dia.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
drivers/net/forcedeth.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/net/forcedeth.c~forcedeth-fix-tx-timeout drivers/net/forcedeth.c
--- a/drivers/net/forcedeth.c~forcedeth-fix-tx-timeout
+++ a/drivers/net/forcedeth.c
@@ -2050,9 +2050,10 @@ static void nv_tx_timeout(struct net_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);
_
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists