Skip to contentSkip to conversation

Patch "iwlwifi: mvm: fix pending frames tracking on tx resp" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 29, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iwlwifi: mvm: fix pending frames tracking on tx resp

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iwlwifi-mvm-fix-pending-frames-tracking-on-tx-resp.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 7585c354637bb003ce612dd22f5047c015545ef4 Mon Sep 17 00:00:00 2001

From: Liad Kaufman <[email protected]>
Date: Thu, 7 Jul 2016 11:00:26 +0300
Subject: iwlwifi: mvm: fix pending frames tracking on tx resp

From: Liad Kaufman <[email protected]>

commit 7585c354637bb003ce612dd22f5047c015545ef4 upstream.

In iwl_mvm_rx_tx_cmd_single(), when checking if a given TID is aggregated, the driver doesn't check whether or not the queue itself can be aggregated. For example, a management queue might be marked as aggregated if TID 0 is aggregated on a (different) data queue.

Make sure that mgmt frames are sent with TID IWL_TID_NON_QOS, and in this way make sure no mixups of this sort happen.

Fixes commit 24afba7690e4 ("iwlwifi: mvm: support bss dynamic alloc/dealloc of queues")
---
 drivers/net/wireless/intel/iwlwifi/mvm/tx.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +5 -1
@@ -903,9 +903,13 @@ static int iwl_mvm_tx_mpdu(struct iwl_mv
 		tid = IWL_MAX_TID_COUNT;
 	}
 
-	if (iwl_mvm_is_dqa_supported(mvm))
+	if (iwl_mvm_is_dqa_supported(mvm)) {
 		txq_id = mvmsta->tid_data[tid].txq_id;
 
+		if (ieee80211_is_mgmt(fc))
+			tx_cmd->tid_tspec = IWL_TID_NON_QOS;
+	}
+
 	/* Copy MAC header from skb into command buffer */
 	memcpy(tx_cmd->hdr, hdr, hdrlen);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/iwlwifi-mvm-free-reserved-queue-on-sta-removal.patch queue-4.8/iwlwifi-mvm-fix-pending-frames-tracking-on-tx-resp.patch