summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/scan.c
diff options
context:
space:
mode:
authorIlan Peer2013-02-11 07:50:45 +0100
committerJohannes Berg2013-02-18 20:18:20 +0100
commitd91b06d214de610807456839d543c1c2e622e9b5 (patch)
tree2f0ed900b0cf5290286e43ec71d105b833302bbd /drivers/net/wireless/iwlwifi/mvm/scan.c
parentiwlwifi: mvm: fix time event command handling race (diff)
downloadkernel-qcow2-linux-d91b06d214de610807456839d543c1c2e622e9b5.tar.gz
kernel-qcow2-linux-d91b06d214de610807456839d543c1c2e622e9b5.tar.xz
kernel-qcow2-linux-d91b06d214de610807456839d543c1c2e622e9b5.zip
iwlwifi: mvm: Set the scan type according to the vif type
The FW can differentiate between scans, according to the interface type on which the scan was issues. Supply the interfaces type information to the FW. Signed-off-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 406c53ad0a49..9b21b92aa8d1 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -292,7 +292,12 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,
cmd->rxon_flags = iwl_mvm_scan_rxon_flags(req);
cmd->filter_flags = cpu_to_le32(MAC_FILTER_ACCEPT_GRP |
MAC_FILTER_IN_BEACON);
- cmd->type = SCAN_TYPE_FORCED;
+
+ if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
+ cmd->type = cpu_to_le32(SCAN_TYPE_DISCOVERY_FORCED);
+ else
+ cmd->type = cpu_to_le32(SCAN_TYPE_FORCED);
+
cmd->repeats = cpu_to_le32(1);
/*