2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index fda824735e18..e96cef89f121 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2752,6 +2752,8 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
 
         txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
         wr32(E1000_TXDCTL(reg_idx), txdctl);
+
+        netdev_tx_reset_queue(txring_txq(ring));
 }
 
 /**
@@ -3244,7 +3246,6 @@ static void igb_clean_tx_ring(struct igb_ring *tx_ring)
                 buffer_info = &tx_ring->tx_buffer_info[i];
                 igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
         }
-        netdev_tx_reset_queue(txring_txq(tx_ring));
 
         size = sizeof(struct igb_tx_buffer) * tx_ring->count;
         memset(tx_ring->tx_buffer_info, 0, size);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b195a34440bb..4bf314fe2145 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1939,6 +1939,7 @@ static inline void netdev_completed_queue(struct net_device *dev,
 static inline void netdev_tx_reset_queue(struct netdev_queue *q)
 {
 #ifdef CONFIG_BQL
+        clear_bit(__QUEUE_STATE_STACK_XOFF, &q->state);
         dql_reset(&q->dql);
 #endif
 }