wpa_supplicant: Update to BRCM version 0.8.0-37
- Allow AP_SME support
- Do not send disassoc after EAP failure since AP_SME is enabled
and del_station will be called
- Allow group idle timeout to run during WPS disconnect
Change-Id: I7e9e15b9c44804196bc98c01d51a71e24412b91d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c
index 8dba46d..31600fc 100644
--- a/wpa_supplicant/ctrl_iface_unix.c
+++ b/wpa_supplicant/ctrl_iface_unix.c
@@ -184,8 +184,8 @@
wpa_s = eloop_ctx;
}
os_memmove(ifname, ifend, strlen(ifend) + 1);
- wpa_printf(MSG_DEBUG, "wpa_s %p cmd %s", wpa_s, buf);
}
+ wpa_printf(MSG_INFO, "wpa_s %p cmd %s", wpa_s, buf);
#endif /* defined CONFIG_P2P && defined ANDROID_P2P */
reply = wpa_supplicant_ctrl_iface_process(wpa_s, buf,
&reply_len);
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index f4df4b0..3dc633c 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -3004,7 +3004,17 @@
struct wpabuf *wps_ie, *ies;
size_t ielen;
int freqs[2] = { 0, 0 };
+#ifdef ANDROID_P2P
+ int oper_freq;
+ /* If freq is not provided, check the operating freq of the GO and do a
+ * a directed scan to save time
+ */
+ if(!freq) {
+ freq = (oper_freq = p2p_get_oper_freq(wpa_s->global->p2p,
+ wpa_s->pending_join_iface_addr) == -1) ? 0 : oper_freq;
+ }
+#endif
os_memset(¶ms, 0, sizeof(params));
/* P2P Wildcard SSID */
@@ -4384,7 +4394,7 @@
"during provisioning");
return;
}
-
+#ifndef ANDROID_P2P
if (wpa_s->show_group_started) {
/*
* Use the normal group formation timeout between the end of
@@ -4397,6 +4407,7 @@
"complete");
return;
}
+#endif
wpa_printf(MSG_DEBUG, "P2P: Set P2P group idle timeout to %u seconds",
timeout);