commit 48b484ba71c4bcd8a75f528d034a0ac1598ced55
author Jimmy Chen <jimmycmchen@google.com> Tue Jan 25 00:17:50 2022 +0800
committer Jimmy Chen <jimmycmchen@google.com> Fri Jan 28 16:55:00 2022 +0800
tree 44af57e2c1e9ea20e6e022e48e6c9ec1988f7448
parent 08aa2c7d39dd446e2a26bd9e7689c7eb0f6db23f

p2p: set p2p probe response vendor information elements for p2p dev interface

The p2p dev interface is not a top interface, but a child of
the global interface. As a result, the response vendor ies are
always skipped.

Bug: 197695047
Test: use WifiP2pManager::setVendorElements to set VSIEs on Pixel 6 Pro
Change-Id: I4e91070132f461eaa13a1643fdec49e0f647fd69

wpa_supplicant/wpa_supplicant.c

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 5cc6952..674e194 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -8107,7 +8107,7 @@
 	}
 
 #ifdef CONFIG_P2P
-	if (wpa_s->parent == wpa_s &&
+	if ((wpa_s->parent == wpa_s || (wpa_s == wpa_s->p2pdev && wpa_s->p2p_mgmt)) &&
 	    wpa_s->global->p2p &&
 	    !wpa_s->global->p2p_disabled)
 		p2p_set_vendor_elems(wpa_s->global->p2p, wpa_s->vendor_elem);