From b40400eccc50b48c4a4d7c88eca60bbf78451bfe Mon Sep 17 00:00:00 2001 From: Ilan Peer Date: Mon, 11 Feb 2013 08:50:45 +0200 Subject: [PATCH] --- yaml --- r: 352807 b: refs/heads/master c: d91b06d214de610807456839d543c1c2e622e9b5 h: refs/heads/master i: 352805: baff6e33d05bfc8ef90c22d9102388477eca2cfc 352803: f520411b6206b14686e1f8b444a698f330b266c2 352799: e457a6e40b20e0675ec3c039d00655ae79eeb493 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/mvm/scan.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2a65b16f26d8..b6f472dd1124 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e372282241316209b44ee6a7c40b9b465744fc0d +refs/heads/master: d91b06d214de610807456839d543c1c2e622e9b5 diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/scan.c b/trunk/drivers/net/wireless/iwlwifi/mvm/scan.c index 406c53ad0a49..9b21b92aa8d1 100644 --- a/trunk/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/trunk/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); /*