diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-17 23:51:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-17 23:51:10 +0200 |
| commit | 1bab8d4c488be22d57f9dd09968c90a0ddc413bf (patch) | |
| tree | 81318cd13170a3b6b72489f63e92adb0eaf49693 /drivers/net/ethernet/amazon/ena | |
| parent | Merge branch 'mlxsw-spectrum_buffers-Add-the-ability-to-query-the-CPU-ports-shared-buffer' (diff) | |
| parent | xen-netfront: do not assume sk_buff_head list is empty in error handling (diff) | |
| download | linux-dev-1bab8d4c488be22d57f9dd09968c90a0ddc413bf.tar.xz linux-dev-1bab8d4c488be22d57f9dd09968c90a0ddc413bf.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Pull in bug fixes from 'net' tree for the merge window.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amazon/ena')
| -rw-r--r-- | drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index e4bf7a4af87a..c487d2a7d6dd 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -824,7 +824,8 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget) above_thresh = ena_com_sq_have_enough_space(tx_ring->ena_com_io_sq, ENA_TX_WAKEUP_THRESH); - if (netif_tx_queue_stopped(txq) && above_thresh) { + if (netif_tx_queue_stopped(txq) && above_thresh && + test_bit(ENA_FLAG_DEV_UP, &tx_ring->adapter->flags)) { netif_tx_wake_queue(txq); u64_stats_update_begin(&tx_ring->syncp); tx_ring->tx_stats.queue_wakeup++; |