---

yaml --- r: 352807 b: refs/heads/master c: d91b06d h: refs/heads/master i: 352805: baff6e3 352803: f520411 352799: e457a6e v: v3
git-mirror · Feb 18, 2013 · b40400e · b40400e
1 parent bbf3f62
commit b40400e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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);
 
 	/*