From 394169f43862f5f8da61ee18d01976e21dee77b5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 4 Mar 2009 09:53:15 +0000 Subject: [PATCH] --- yaml --- r: 135055 b: refs/heads/master c: 32d760073eacd41ecc815db1e958f0e1e0b82d57 h: refs/heads/master i: 135053: 3141b7881fea1e8b97d0008ba24ad8052fe5b654 135051: 238f2d93a85ec540e4876fa23103c4efcf612ca7 135047: 0f0bb1c82c90b9beee4e03529a94ea1f677c8793 135039: a1faa895b3f15f122214fdfc7fae0813836cf65c v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 741c395dc7d9..83c41b91fc09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c870379d2db81a11ede65e9fd9774e4e6efe84a +refs/heads/master: 32d760073eacd41ecc815db1e958f0e1e0b82d57 diff --git a/trunk/drivers/net/sfc/tx.c b/trunk/drivers/net/sfc/tx.c index 9f97e44840b6..b1e190779073 100644 --- a/trunk/drivers/net/sfc/tx.c +++ b/trunk/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));