aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-03-04 04:53:15 -0500
committerDavid S. Miller <davem@davemloft.net>2009-03-04 20:40:23 -0500
commit32d760073eacd41ecc815db1e958f0e1e0b82d57 (patch)
tree25401e29b2090d73d0b32191393a1f5fc01ddf02 /drivers/net
parent8c870379d2db81a11ede65e9fd9774e4e6efe84a (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sfc/tx.c2
1 files changed, 1 insertions, 1 deletions
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)
400 * separates the update of read_count from the test of 400 * separates the update of read_count from the test of
401 * stopped. */ 401 * stopped. */
402 smp_mb(); 402 smp_mb();
403 if (unlikely(tx_queue->stopped)) { 403 if (unlikely(tx_queue->stopped) && likely(efx->port_enabled)) {
404 fill_level = tx_queue->insert_count - tx_queue->read_count; 404 fill_level = tx_queue->insert_count - tx_queue->read_count;
405 if (fill_level < EFX_NETDEV_TX_THRESHOLD(tx_queue)) { 405 if (fill_level < EFX_NETDEV_TX_THRESHOLD(tx_queue)) {
406 EFX_BUG_ON_PARANOID(!efx_dev_registered(efx)); 406 EFX_BUG_ON_PARANOID(!efx_dev_registered(efx));