summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/mac80211.c
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2014-04-24 13:15:29 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-06 21:56:37 +0300
commitbd5e4744a6ca64299b57a2682c720d00a475a734 (patch)
tree424ca23cb20ac8fbf6e8f3a71e77dc1bbcc28a88 /drivers/net/wireless/iwlwifi/mvm/mac80211.c
parent8e96440e8d42da0dab02cae125ea59e2b64c77fe (diff)
downloadop-kernel-dev-bd5e4744a6ca64299b57a2682c720d00a475a734.zip
op-kernel-dev-bd5e4744a6ca64299b57a2682c720d00a475a734.tar.gz
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> Reviewed-by: Luciano Coelho <luciano.coelho@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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index f0cebf1..593f723 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1807,6 +1807,11 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
mutex_lock(&mvm->mutex);
+ if (iwl_mvm_is_associated(mvm)) {
+ ret = -EBUSY;
+ goto out;
+ }
+
switch (mvm->scan_status) {
case IWL_MVM_SCAN_OS:
IWL_DEBUG_SCAN(mvm, "Stopping previous scan for sched_scan\n");
OpenPOWER on IntegriCloud