diff options
| author | Luciano Coelho <luciano.coelho@intel.com> | 2015-04-09 14:48:11 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-04-29 13:12:47 +0300 |
| commit | c1537664086f6a44dde2cda85d2ee023a7c76791 (patch) | |
| tree | f7c7f3e9a7cf148b0b20183ff79d06989dd61ec5 /drivers/net/wireless/iwlwifi/mvm/scan.c | |
| parent | 0616c62c1659200419a810601e96d3e5e9d559e6 (diff) | |
| download | lwn-c1537664086f6a44dde2cda85d2ee023a7c76791.tar.gz lwn-c1537664086f6a44dde2cda85d2ee023a7c76791.zip | |
iwlwifi: mvm: don't increase max_out_time when low priority scan is requested
In some cases, max_out_time value is smaller than 200 and having the
NL80211_SCAN_FLAG_LOW_PRIORITY flag was actually causing the
max_out_time to be increased. To avoid that, set max_out_time to 200
only if it's greater than 200.
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Alexander Bondar <alexander.bondar@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/scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index 9f7250585393..8a0b2442e544 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -257,7 +257,8 @@ static void iwl_mvm_scan_calc_params(struct iwl_mvm *mvm, } } - if (flags & NL80211_SCAN_FLAG_LOW_PRIORITY) + if ((flags & NL80211_SCAN_FLAG_LOW_PRIORITY) && + (params->max_out_time > 200)) params->max_out_time = 200; not_bound: |