Commit 1008e442 authored Jan 17, 2015 by Ilan Peer Committed by Emmanuel Grumbach Jan 22, 2015

iwlwifi: mvm: Do not consider invalid HW queues in queue mask



The iwl_mvm_mac_get_queues_mask() added vif->hw_queue[ac] to the
queue mask although it might be set to IEEE80211_INVAL_HW_QUEUE.
Fix it.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

parent e583b50c

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -208,8 +208,10 @@ u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif)
		if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
		return BIT(IWL_MVM_OFFCHANNEL_QUEUE);

		for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
		for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
		if (vif->hw_queue[ac] != IEEE80211_INVAL_HW_QUEUE)
		qmask \|= BIT(vif->hw_queue[ac]);
		}

		if (vif->type == NL80211_IFTYPE_AP)
		qmask \|= BIT(vif->cab_queue);

Admin message