This is a note to let you know that I've just added the patch titled
iwlwifi: mvm: disable scheduled scan
to the 3.13-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-disable-scheduled-scan.patch
and it can be found in the queue-3.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 0822afe8ebb9389997ef677447c7b08e08797de9 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu, 16 Jan 2014 09:18:07 +0100
Subject: iwlwifi: mvm: disable scheduled scan
From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit 0822afe8ebb9389997ef677447c7b08e08797de9 upstream.
The iwlwifi scheduled scan implementation doesn't adhere to the
userspace API correctly - the API assumes that any new incoming
'incompatible' request (like scan or remain-on-channel for this
driver) will just cancel the scheduled scan. Instead our driver
relies on userspace cancelling it, thus breaking existing wpa_s
versions.
Fixes: 35a000b7c1bb ("iwlwifi: mvm: support sched scan if supported by the fw")
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -246,7 +246,7 @@ int iwl_mvm_mac_setup_register(struct iw
else
hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
- if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) {
+ if (0 && mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) {
hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX;
hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES;
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-3.13/iwlwifi-mvm-bt-coex-disable-bt-when-txing-probe-request-in-scan.patch
queue-3.13/mac80211-release-the-channel-in-error-path-in-start_ap.patch
queue-3.13/iwlwifi-mvm-disable-scheduled-scan.patch
queue-3.13/nl80211-reset-split_start-when-netlink-skb-is-exhausted.patch
queue-3.13/mac80211-fix-fragmentation-code-particularly-for-encryption.patch
queue-3.13/iwlwifi-mvm-don-t-allow-a-band-if-sku-forbids-it.patch
queue-3.13/mac80211-fix-ibss-disconnect.patch
queue-3.13/mac80211-move-roc-cookie-assignment-earlier.patch
queue-3.13/iwlwifi-mvm-print-the-version-of-the-firmware-when-it-asserts.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html