aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2014-12-03 03:52:26 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-03-26 03:11:38 -0400
commit2250fd94c8887bdf0fb583a8f35bf555a0fff81c (patch)
tree0bb0aa7b2c6c1fc4909b7cc78eb6c99fcf04f0eb
parent483f3ab1754f3c3698db622cc181249a0ca6372c (diff)
iwlwifi: mvm: add delay to scheduled scan
Add support for delaying the start of a scheduled scan (or a WoWLAN net-detect scan). Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 63525876f68a..2997864fb13f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -935,6 +935,8 @@ int iwl_mvm_unified_sched_scan_lmac(struct iwl_mvm *mvm,
935 935
936 cmd->n_channels = (u8)req->n_channels; 936 cmd->n_channels = (u8)req->n_channels;
937 937
938 cmd->delay = cpu_to_le32(req->delay);
939
938 if (iwl_mvm_scan_pass_all(mvm, req)) 940 if (iwl_mvm_scan_pass_all(mvm, req))
939 flags |= IWL_MVM_LMAC_SCAN_FLAG_PASS_ALL; 941 flags |= IWL_MVM_LMAC_SCAN_FLAG_PASS_ALL;
940 else 942 else
@@ -1436,7 +1438,13 @@ int iwl_mvm_sched_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
1436 cpu_to_le16(req->interval / MSEC_PER_SEC); 1438 cpu_to_le16(req->interval / MSEC_PER_SEC);
1437 sec_part->schedule[0].iter_count = 0xff; 1439 sec_part->schedule[0].iter_count = 0xff;
1438 1440
1439 sec_part->delay = 0; 1441 if (req->delay > U16_MAX) {
1442 IWL_DEBUG_SCAN(mvm,
1443 "delay value is > 16-bits, set to max possible\n");
1444 sec_part->delay = cpu_to_le16(U16_MAX);
1445 } else {
1446 sec_part->delay = cpu_to_le16(req->delay);
1447 }
1440 1448
1441 iwl_mvm_build_unified_scan_probe(mvm, vif, ies, &sec_part->preq, 1449 iwl_mvm_build_unified_scan_probe(mvm, vif, ies, &sec_part->preq,
1442 req->flags & NL80211_SCAN_FLAG_RANDOM_ADDR ? 1450 req->flags & NL80211_SCAN_FLAG_RANDOM_ADDR ?