Skip to contentSkip to conversation

Patch "iwlwifi: mvm: fix a few firmware capability checks" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 4, 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 a few firmware capability checks

to the 4.4-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-a-few-firmware-capability-checks.patch
and it can be found in the queue-4.4 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 280a3efa82fccc9532c968a77e5162cb9f0af497 Mon Sep 17 00:00:00 2001

From: Johannes Berg <[email protected]>
Date: Tue, 7 Jun 2016 14:46:37 +0200
Subject: iwlwifi: mvm: fix a few firmware capability checks

From: Johannes Berg <[email protected]>

commit 280a3efa82fccc9532c968a77e5162cb9f0af497 upstream.

My cleanup in "iwlwifi: prepare for higher API/CAPA bits" accidentally inverted a few tests - fix them.

Fixes 859d914c8f5c ("iwlwifi: prepare for higher API/CAPA bits")
---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +4 -4
@@ -3992,8 +3992,8 @@ static int iwl_mvm_mac_get_survey(struct
 	if (idx != 0)
 		return -ENOENT;
 
-	if (fw_has_capa(&mvm->fw->ucode_capa,
-			IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
+	if (!fw_has_capa(&mvm->fw->ucode_capa,
+			 IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
 		return -ENOENT;
 
 	mutex_lock(&mvm->mutex);
@@ -4039,8 +4039,8 @@ static void iwl_mvm_mac_sta_statistics(s
 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
 
-	if (fw_has_capa(&mvm->fw->ucode_capa,
-			IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
+	if (!fw_has_capa(&mvm->fw->ucode_capa,
+			 IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
 		return;
 
 	/* if beacon filtering isn't on mac80211 does it anyway */

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

queue-4.4/iwlwifi-mvm-fix-a-few-firmware-capability-checks.patch