aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2014-04-27 02:54:54 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-11 06:08:50 -0400
commit723f02ed6cca384e74c277428f7a4f01f5b18683 (patch)
tree5f66171aaee0b59779a86214cc577fc7680053c8
parent636a2cdcb991d91064900d580f39e1cad8947502 (diff)
iwlwifi: mvm: stop sched scan before association
Stop sched scan on bss_info_changed if !idle to avoid sched scan during association. Signed-off-by: David Spinadel <david.spinadel@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 66fa21b8737c..72f73a3abc71 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1512,6 +1512,9 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
1512 1512
1513 mutex_lock(&mvm->mutex); 1513 mutex_lock(&mvm->mutex);
1514 1514
1515 if (changes & BSS_CHANGED_IDLE && !bss_conf->idle)
1516 iwl_mvm_sched_scan_stop(mvm, true);
1517
1515 switch (vif->type) { 1518 switch (vif->type) {
1516 case NL80211_IFTYPE_STATION: 1519 case NL80211_IFTYPE_STATION:
1517 iwl_mvm_bss_info_changed_station(mvm, vif, bss_conf, changes); 1520 iwl_mvm_bss_info_changed_station(mvm, vif, bss_conf, changes);