From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 4 Mar 2009 09:53:15 +0000 (+0000)
Subject: sfc: Don't wake TX queues while they're being flushed
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=32d760073eacd41ecc815db1e958f0e1e0b82d57;p=openwrt%2Fstaging%2Fblogic.git

sfc: Don't wake TX queues while they're being flushed

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index 9f97e44840b6..b1e190779073 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -400,7 +400,7 @@ void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)
 	 * separates the update of read_count from the test of
 	 * stopped. */
 	smp_mb();
-	if (unlikely(tx_queue->stopped)) {
+	if (unlikely(tx_queue->stopped) && likely(efx->port_enabled)) {
 		fill_level = tx_queue->insert_count - tx_queue->read_count;
 		if (fill_level < EFX_NETDEV_TX_THRESHOLD(tx_queue)) {
 			EFX_BUG_ON_PARANOID(!efx_dev_registered(efx));