summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/mac80211.c
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2014-05-13 14:29:36 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-13 15:05:32 +0300
commitb538b8ce76f69f7fa225bc0817bbb361b877ea23 (patch)
tree4dc23349b6f940a43520f64972e0da35d272fb4a /drivers/net/wireless/iwlwifi/mvm/mac80211.c
parent64793110ad4d82e18d88a33307749c6562a6dd04 (diff)
downloadop-kernel-dev-b538b8ce76f69f7fa225bc0817bbb361b877ea23.zip
op-kernel-dev-b538b8ce76f69f7fa225bc0817bbb361b877ea23.tar.gz
iwlwifi: mvm: prevent sched scan while not idle
Prevent sched scan while not idle (including during association or in AP mode) instead of while associated only. This fixes my previous commit which was incomplete: commit bd5e4744a6ca64299b57a2682c720d00a475a734 Author: David Spinadel <david.spinadel@intel.com> Date: Thu Apr 24 13:15:29 2014 +0300 iwlwifi: mvm: do no sched scan while associated Currently the FW doesn't support sched scan while associated, Prevent it. 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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 4b0b8b6..b41dc84 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1807,7 +1807,7 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
mutex_lock(&mvm->mutex);
- if (iwl_mvm_is_associated(mvm)) {
+ if (!iwl_mvm_is_idle(mvm)) {
ret = -EBUSY;
goto out;
}
OpenPOWER on IntegriCloud