commit a3015e7a7aee0fbd3decdfd61d282344de9236f8
author Dmitry Shmidt <dimitrysh@google.com> Thu Sep 25 18:27:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 25 18:27:55 2014 +0000
tree a693c6fac2f0c352ec7cfb743b86f257210a7bd9
parent 429a33ca709ee5b2de9e0163917c72c80444bb58
parent 376e1c49a92868fb0f2785ff01da2f5954341474

am 376e1c49: Android: Skip explicit conf_p2p_dev loading for main interface

* commit '376e1c49a92868fb0f2785ff01da2f5954341474':
  Android: Skip explicit conf_p2p_dev loading for main interface

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 */
 
 		/*