commit ca3e2d0b6384c60c82c58d5ad682784ee4c89ad0
author Dmitry Shmidt <dimitrysh@google.com> Fri Sep 26 15:25:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 15:25:25 2014 +0000
tree a693c6fac2f0c352ec7cfb743b86f257210a7bd9
parent cfaf2c3d999a9b413301b9989fdd023cfa313321
parent c7cf1602c4f6924675f86c1e10387f084c199ae0

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

* commit 'c7cf1602c4f6924675f86c1e10387f084c199ae0':
  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 */
 
 		/*