1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index 0093e78dd571..bd2596fdafda 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -698,7 +698,13 @@ static bool iwl_mvm_update_txq_mapping(struct iwl_mvm *mvm, int queue,
         if (mvm->queue_info[queue].hw_queue_refcount > 0)
                 enable_queue = false;
 
-        mvm->hw_queue_to_mac80211[queue] |= BIT(mac80211_queue);
+        if (mac80211_queue != IEEE80211_INVAL_HW_QUEUE) {
+                WARN(mac80211_queue >=
+                     BITS_PER_BYTE * sizeof(mvm->hw_queue_to_mac80211[0]),
+                     "cannot track mac80211 queue %d (queue %d, sta %d, tid %d)\n",
+                     mac80211_queue, queue, sta_id, tid);
+                mvm->hw_queue_to_mac80211[queue] |= BIT(mac80211_queue);
+        }
 
         mvm->queue_info[queue].hw_queue_refcount++;
         mvm->queue_info[queue].tid_bitmap |= BIT(tid);