diff options
| author | Ben Hutchings | 2009-03-04 10:53:15 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-03-05 02:40:23 +0100 |
| commit | 32d760073eacd41ecc815db1e958f0e1e0b82d57 (patch) | |
| tree | 25401e29b2090d73d0b32191393a1f5fc01ddf02 | |
| parent | sfc: Clear I2C adapter structure in falcon_remove_nic() (diff) | |
| download | kernel-qcow2-linux-32d760073eacd41ecc815db1e958f0e1e0b82d57.tar.gz kernel-qcow2-linux-32d760073eacd41ecc815db1e958f0e1e0b82d57.tar.xz kernel-qcow2-linux-32d760073eacd41ecc815db1e958f0e1e0b82d57.zip | |
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>
| -rw-r--r-- | drivers/net/sfc/tx.c | 2 |
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) * 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)); |