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>

diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 9f725058539359732974f29abb9d77df9f94393d..8a0b2442e5449cbdae7cf4c5fc3d483f95b4c79a 100644 (file)
--- 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: