openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: mvm: set max_out_time equal to frag_passive_dwell in fragmented scan 

Fragmented scan should be applied for all channels, passive and active.
When scanning on passive channels the firmware uses frag_passive_dwell
to define the maximum continuous scan time before returning to the
operating channel. On active channels max_out_time is the parameter
used by the firmware to define the maximum time allowed out of the
operating channel. Since active channels' scan should also be fragmented
set max_out_time equal to frag_passive_dwell.
In addition:
- Set max_out_time and suspend_time if the firmware doesn't support
  fragmented scan to avoid unexpected behavior.
- Adjust max_out_time for second level of scan precedence.

Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Reviewed-by: Alexander Bondar <alexander.bondar@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Haim Dreyfuss 2014-12-18 12:34:01 +02:00 committed by Emmanuel Grumbach
parent afe08e1cd5
commit 44e9cd7e40
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/mvm/scan.c
View File

@ -309,18 +309,18 @@ static void iwl_mvm_scan_calc_params(struct iwl_mvm *mvm,
goto not_bound; goto not_bound;
params->suspend_time = 30; params->suspend_time = 30;
params->max_out_time = 170; params->max_out_time = 120;
if (iwl_mvm_low_latency(mvm)) { if (iwl_mvm_low_latency(mvm)) {
if (mvm->fw->ucode_capa.api[0] & if (mvm->fw->ucode_capa.api[0] &
IWL_UCODE_TLV_API_FRAGMENTED_SCAN) { IWL_UCODE_TLV_API_FRAGMENTED_SCAN) {
params->suspend_time = 105; params->suspend_time = 105;
params->max_out_time = 70;
/* /*
* If there is more than one active interface make * If there is more than one active interface make
* passive scan more fragmented. * passive scan more fragmented.
*/ */
frag_passive_dwell = (global_cnt < 2) ? 40 : 20; frag_passive_dwell = (global_cnt < 2) ? 40 : 20;
params->max_out_time = frag_passive_dwell;
} else { } else {
params->suspend_time = 120; params->suspend_time = 120;
params->max_out_time = 120; params->max_out_time = 120;