iwlwifi: mvm: add back support for low-priority scan
The low-priority scan feature can be useful, e.g. for OBSS scans (if those are required by the AP); add back support for it, restoring the maximum out time to the value it was for low-priority scan before that was removed. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
parent
0564679bb6
commit
ab48003032
|
@ -374,6 +374,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
|
||||||
hw->wiphy->max_sched_scan_ie_len = SCAN_OFFLOAD_PROBE_REQ_SIZE - 24 - 2;
|
hw->wiphy->max_sched_scan_ie_len = SCAN_OFFLOAD_PROBE_REQ_SIZE - 24 - 2;
|
||||||
|
|
||||||
hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN |
|
hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN |
|
||||||
|
NL80211_FEATURE_LOW_PRIORITY_SCAN |
|
||||||
NL80211_FEATURE_P2P_GO_OPPPS;
|
NL80211_FEATURE_P2P_GO_OPPPS;
|
||||||
|
|
||||||
mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
|
mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
|
||||||
|
|
|
@ -267,7 +267,7 @@ static void iwl_mvm_scan_condition_iterator(void *data, u8 *mac,
|
||||||
|
|
||||||
static void iwl_mvm_scan_calc_params(struct iwl_mvm *mvm,
|
static void iwl_mvm_scan_calc_params(struct iwl_mvm *mvm,
|
||||||
struct ieee80211_vif *vif,
|
struct ieee80211_vif *vif,
|
||||||
int n_ssids,
|
int n_ssids, u32 flags,
|
||||||
struct iwl_mvm_scan_params *params)
|
struct iwl_mvm_scan_params *params)
|
||||||
{
|
{
|
||||||
bool global_bound = false;
|
bool global_bound = false;
|
||||||
|
@ -289,6 +289,9 @@ static void iwl_mvm_scan_calc_params(struct iwl_mvm *mvm,
|
||||||
params->max_out_time = 250;
|
params->max_out_time = 250;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (flags & NL80211_SCAN_FLAG_LOW_PRIORITY)
|
||||||
|
params->max_out_time = 200;
|
||||||
|
|
||||||
not_bound:
|
not_bound:
|
||||||
|
|
||||||
for (band = IEEE80211_BAND_2GHZ; band < IEEE80211_NUM_BANDS; band++) {
|
for (band = IEEE80211_BAND_2GHZ; band < IEEE80211_NUM_BANDS; band++) {
|
||||||
|
@ -332,7 +335,7 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,
|
||||||
cmd->quiet_plcp_th = cpu_to_le16(IWL_PLCP_QUIET_THRESH);
|
cmd->quiet_plcp_th = cpu_to_le16(IWL_PLCP_QUIET_THRESH);
|
||||||
cmd->rxchain_sel_flags = iwl_mvm_scan_rx_chain(mvm);
|
cmd->rxchain_sel_flags = iwl_mvm_scan_rx_chain(mvm);
|
||||||
|
|
||||||
iwl_mvm_scan_calc_params(mvm, vif, req->n_ssids, ¶ms);
|
iwl_mvm_scan_calc_params(mvm, vif, req->n_ssids, req->flags, ¶ms);
|
||||||
cmd->max_out_time = cpu_to_le32(params.max_out_time);
|
cmd->max_out_time = cpu_to_le32(params.max_out_time);
|
||||||
cmd->suspend_time = cpu_to_le32(params.suspend_time);
|
cmd->suspend_time = cpu_to_le32(params.suspend_time);
|
||||||
if (params.passive_fragmented)
|
if (params.passive_fragmented)
|
||||||
|
@ -758,7 +761,7 @@ int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,
|
||||||
if (!scan_cfg)
|
if (!scan_cfg)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
iwl_mvm_scan_calc_params(mvm, vif, req->n_ssids, ¶ms);
|
iwl_mvm_scan_calc_params(mvm, vif, req->n_ssids, 0, ¶ms);
|
||||||
iwl_build_scan_cmd(mvm, vif, req, &scan_cfg->scan_cmd, ¶ms);
|
iwl_build_scan_cmd(mvm, vif, req, &scan_cfg->scan_cmd, ¶ms);
|
||||||
scan_cfg->scan_cmd.len = cpu_to_le16(cmd_len);
|
scan_cfg->scan_cmd.len = cpu_to_le16(cmd_len);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue