aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunil Dutt <usdutt@codeaurora.org>2015-05-12 13:07:01 +0530
committerAkash Patel <akashp@codeaurora.org>2015-05-12 12:10:51 -0700
commit55dc720432e4de5dff0fc8e8d063a4a248b2c488 (patch)
tree714e481201e862e63504296075a805e943a9b2f3
parent01421cbd7fc8acb7f7598c051f5e40aa10f48556 (diff)
downloadandroid_external_wpa_supplicant_8-55dc720432e4de5dff0fc8e8d063a4a248b2c488.tar.gz
android_external_wpa_supplicant_8-55dc720432e4de5dff0fc8e8d063a4a248b2c488.tar.bz2
android_external_wpa_supplicant_8-55dc720432e4de5dff0fc8e8d063a4a248b2c488.zip
Advertize cross connection p2p ie's to WLAN AP on a non p2p interface
commit 1c2aa04c96626f5b000d167bb5274a8c39b7dac2 addresses to not add the p2p ie's on a non p2p interface.AP's functioning as a p2p manager shall need the cross connection capability of the station. This commit ensures the device sends this capability for a WLAN AP on a query to get the same. This is also required to address the certification requirements. Change-Id: I62f3fa432451d15296e0fe82c439a286c565c226 CRs-fixed: 836613
-rw-r--r--wpa_supplicant/p2p_supplicant.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 4c2d838e..7a2bc923 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -5876,7 +5876,10 @@ int wpas_p2p_assoc_req_ie(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
if (wpa_s->global->p2p_disabled)
return -1;
- if (wpa_s->conf->p2p_disabled)
+ /* Advertize mandatory cross connection capability in response the
+ * query to a WLAN AP.
+ */
+ if (wpa_s->conf->p2p_disabled && p2p_group == 1)
return -1;
if (wpa_s->global->p2p == NULL)
return -1;