[PATCH] Android: Skip explicit conf_p2p_dev loading for main interface

Dmitry Shmidt dimitrysh at google.com
Wed Sep 24 13:38:31 EDT 2014


It will be loaded later for Non-netdev p2p interface.

Change-Id: Ib53daf22c84f2581b499462dc09a74ccfbac226a
Signed-off-by: Dmitry Shmidt <dimitrysh at google.com>
---
 wpa_supplicant/wpa_supplicant.c | 2 ++
 1 file changed, 2 insertions(+)

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 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
 
 #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 */
 
 		/*
-- 
2.1.0.rc2.206.gedb03e5



More information about the HostAP mailing list