iwlwifi: mvm: don't stop regular scans when going out of idle state
authorLuciano Coelho <luciano.coelho@intel.com>
Tue, 12 May 2015 06:30:36 +0000 (09:30 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 28 May 2015 10:35:20 +0000 (13:35 +0300)
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>
drivers/net/wireless/iwlwifi/mvm/mac80211.c

index 13469315ed33eff44c5962f93b84095b95c54d15..df0199ec4da7179ecf0f7670d038aebe4360f524 100644 (file)
@@ -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: