1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 4cb839ae3e22..0556d139b719 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -1278,8 +1278,6 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
 
                 memset(&info->status, 0, sizeof(info->status));
 
-                info->flags &= ~IEEE80211_TX_CTL_AMPDU;
-
                 /* inform mac80211 about what happened with the frame */
                 switch (status & TX_STATUS_MSK) {
                 case TX_STATUS_SUCCESS:
@@ -1302,10 +1300,11 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
                         (void *)(uintptr_t)le32_to_cpu(tx_resp->initial_rate);
 
                 /* Single frame failure in an AMPDU queue => send BAR */
-                if (txq_id >= mvm->first_agg_queue &&
+                if (info->flags & IEEE80211_TX_CTL_AMPDU &&
                     !(info->flags & IEEE80211_TX_STAT_ACK) &&
                     !(info->flags & IEEE80211_TX_STAT_TX_FILTERED))
                         info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
+                info->flags &= ~IEEE80211_TX_CTL_AMPDU;
 
                 /* W/A FW bug: seq_ctl is wrong when the status isn't success */
                 if (status != TX_STATUS_SUCCESS) {
@@ -1340,7 +1339,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
                 ieee80211_tx_status(mvm->hw, skb);
         }
 
-        if (txq_id >= mvm->first_agg_queue) {
+        if (iwl_mvm_is_dqa_supported(mvm) || txq_id >= mvm->first_agg_queue) {
                 /* If this is an aggregation queue, we use the ssn since:
                  * ssn = wifi seq_num % 256.
                  * The seq_ctl is the sequence control of the packet to which