aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-10-24 10:24:57 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2013-10-24 10:24:57 -0700
commit8f5a5124d3a3b0520e427d93a11389400ae22292 (patch)
tree92bc071e818c3714cfc563fa353ec4c1fa425594
parentc78c238234b255c3efe2c7ce1897b47a06e6ed47 (diff)
parent479ec34dcdc7342e2629841e69ce8dc77714b8d6 (diff)
downloadandroid_external_wpa_supplicant_8-8f5a5124d3a3b0520e427d93a11389400ae22292.tar.gz
android_external_wpa_supplicant_8-8f5a5124d3a3b0520e427d93a11389400ae22292.tar.bz2
android_external_wpa_supplicant_8-8f5a5124d3a3b0520e427d93a11389400ae22292.zip
Merge "P2P: Allow persistent group determination based on Beacon frame"
-rw-r--r--wpa_supplicant/p2p_supplicant.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index a285ff98..368707ac 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -482,6 +482,9 @@ static int wpas_p2p_persistent_group(struct wpa_supplicant *wpa_s,
}
p2p = wpa_bss_get_vendor_ie_multi(bss, P2P_IE_VENDOR_TYPE);
+ if (p2p == NULL)
+ p2p = wpa_bss_get_vendor_ie_multi_beacon(bss,
+ P2P_IE_VENDOR_TYPE);
if (p2p == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Could not figure out whether "
"group is persistent - BSS " MACSTR