summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2015-05-12 08:30:36 +0200
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-05-28 12:35:20 +0200
commit7576d54f9e372dbbe77c5291e15a67296d502674 (patch)
treee6908f439f84dc8dcab6ba379d1dfd7a72f837f1
parentiwlwifi: mvm: reorganize scan stopping functions (diff)
downloadlinux-7576d54f9e372dbbe77c5291e15a67296d502674.tar.xz
linux-7576d54f9e372dbbe77c5291e15a67296d502674.zip
iwlwifi: mvm: don't stop regular scans when going out of idle state
It is not necessary to stop regular scans when going out of idle state. Previously, we were doing so for LMAC scans because the iwl_mvm_scan_offload_stop() function was stopping both kinds of scans. Now that we have more granularity, we can skip it. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 13469315ed33..df0199ec4da7 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -2360,10 +2360,8 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
mutex_lock(&mvm->mutex);
- if (changes & BSS_CHANGED_IDLE && !bss_conf->idle) {
+ if (changes & BSS_CHANGED_IDLE && !bss_conf->idle)
iwl_mvm_sched_scan_stop(mvm, true);
- iwl_mvm_reg_scan_stop(mvm);
- }
switch (vif->type) {
case NL80211_IFTYPE_STATION: