Skip to content

Commit

Permalink
iwlwifi: mvm: prevent sched scan while not idle
Browse files Browse the repository at this point in the history
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 bd5e474
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>
  • Loading branch information
David Spinadel authored and Emmanuel Grumbach committed May 13, 2014
1 parent 6479311 commit b538b8c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/mvm/mac80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/mvm/mvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ static inline bool iwl_mvm_vif_low_latency(struct iwl_mvm_vif *mvmvif)
}

/* Assoc status */
bool iwl_mvm_is_associated(struct iwl_mvm *mvm);
bool iwl_mvm_is_idle(struct iwl_mvm *mvm);

/* Thermal management and CT-kill */
void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);
Expand Down
16 changes: 8 additions & 8 deletions drivers/net/wireless/iwlwifi/mvm/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -645,21 +645,21 @@ bool iwl_mvm_low_latency(struct iwl_mvm *mvm)
return result;
}

static void iwl_mvm_assoc_iter(void *_data, u8 *mac, struct ieee80211_vif *vif)
static void iwl_mvm_idle_iter(void *_data, u8 *mac, struct ieee80211_vif *vif)
{
bool *assoc = _data;
bool *idle = _data;

if (vif->bss_conf.assoc)
*assoc = true;
if (!vif->bss_conf.idle)
*idle = false;
}

bool iwl_mvm_is_associated(struct iwl_mvm *mvm)
bool iwl_mvm_is_idle(struct iwl_mvm *mvm)
{
bool assoc = false;
bool idle = true;

ieee80211_iterate_active_interfaces_atomic(
mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
iwl_mvm_assoc_iter, &assoc);
iwl_mvm_idle_iter, &idle);

return assoc;
return idle;
}

0 comments on commit b538b8c

Please sign in to comment.