aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-10-24 10:24:56 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2013-10-24 10:24:56 -0700
commitc78c238234b255c3efe2c7ce1897b47a06e6ed47 (patch)
tree7e2f727b9cea743edace4257f2ed89384716b9f6
parent3663b786be68b1d8cb50ecd0f37a739451c0e830 (diff)
parentaba939ae1a67a1b77382b0bda9405242a9594164 (diff)
downloadandroid_external_wpa_supplicant_8-c78c238234b255c3efe2c7ce1897b47a06e6ed47.tar.gz
android_external_wpa_supplicant_8-c78c238234b255c3efe2c7ce1897b47a06e6ed47.tar.bz2
android_external_wpa_supplicant_8-c78c238234b255c3efe2c7ce1897b47a06e6ed47.zip
Merge "P2P: Do not allow P2P client connection without P2P IE from GO"
-rw-r--r--wpa_supplicant/events.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index cd2bd1f5..eb3db1b0 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -832,6 +832,13 @@ static struct wpa_ssid * wpa_scan_res_match(struct wpa_supplicant *wpa_s,
}
#ifdef CONFIG_P2P
+ if (ssid->p2p_group &&
+ !wpa_bss_get_vendor_ie(bss, P2P_IE_VENDOR_TYPE) &&
+ !wpa_bss_get_vendor_ie_beacon(bss, P2P_IE_VENDOR_TYPE)) {
+ wpa_dbg(wpa_s, MSG_DEBUG, " skip - no P2P IE seen");
+ continue;
+ }
+
/*
* TODO: skip the AP if its P2P IE has Group Formation
* bit set in the P2P Group Capability Bitmap and we