Merge tag 'mac80211-next-for-davem-2015-10-21' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / net / wireless / iwlwifi / mvm / scan.c

diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 4a1f9af..cee4f26 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -1271,12 +1271,12 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
 
        params.type = iwl_mvm_get_scan_type(mvm, vif, &params);
 
-       if (req->interval > U16_MAX) {
+       if (req->scan_plans[0].interval > U16_MAX) {
                IWL_DEBUG_SCAN(mvm,
                               "interval value is > 16-bits, set to max possible\n");
                params.interval = U16_MAX;
        } else {
-               params.interval = req->interval / MSEC_PER_SEC;
+               params.interval = req->scan_plans[0].interval;
        }
 
        /* In theory, LMAC scans can handle a 32-bit delay, but since