Cumulative patch from commit 3eaaca1a0b372f31ddc43d152c3681dce48889bb
3eaaca1 P2P: Allow GO Negotiation Request to update peer entry after PD
443427e P2P: Add missing direct global ctrl_iface commands for P2P
37b4198 P2P: Use GO's operating channel to optimize scan during join
a691d99 P2P: Don't expire the peer, if GO Negotiation is in progress
a0e9d89 Use minimal scan delay upon EVENT_INTERFACE_ADDED
5ddd07c Reset normal_scans counter upon entering INTERFACE_DISABLED state
Change-Id: I07ea029ba6d473af39c74c10b7058de0056695da
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index de97368..f7ee6e3 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -6345,10 +6345,8 @@
{
#ifdef CONFIG_P2P
static const char * cmd[] = {
-#ifdef ANDROID_P2P
"LIST_NETWORKS",
"SAVE_CONFIG",
-#endif
"P2P_FIND",
"P2P_STOP_FIND",
"P2P_LISTEN",
@@ -6363,12 +6361,12 @@
NULL
};
static const char * prefix[] = {
-#ifdef ANDROID_P2P
+#ifdef ANDROID
"DRIVER ",
+#endif /* ANDROID */
"GET_NETWORK ",
"REMOVE_NETWORK ",
"SET ",
-#endif
"P2P_FIND ",
"P2P_CONNECT ",
"P2P_LISTEN ",