commit 376e1c49a92868fb0f2785ff01da2f5954341474
author Dmitry Shmidt <dimitrysh@google.com> Wed Sep 24 10:38:31 2014 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Wed Sep 24 10:38:31 2014 -0700
tree a693c6fac2f0c352ec7cfb743b86f257210a7bd9
parent ffc7018e299837b8206c6e351db8930cfa6aa3f4

Android: Skip explicit conf_p2p_dev loading for main interface

Bug: 17064125

Change-Id: Ib53daf22c84f2581b499462dc09a74ccfbac226a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

wpa_supplicant/wpa_supplicant.c

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index f20bc62..9d21fe0 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -3509,7 +3509,9 @@
 
 #ifdef CONFIG_P2P
 		wpa_s->conf_p2p_dev = os_rel2abs_path(iface->conf_p2p_dev);
+#ifndef ANDROID_P2P
 		wpa_config_read(wpa_s->conf_p2p_dev, wpa_s->conf);
+#endif
 #endif /* CONFIG_P2P */
 
 		/*