diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-09-24 10:38:31 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-09-24 10:38:31 -0700 |
| commit | 376e1c49a92868fb0f2785ff01da2f5954341474 (patch) | |
| tree | a693c6fac2f0c352ec7cfb743b86f257210a7bd9 | |
| parent | ffc7018e299837b8206c6e351db8930cfa6aa3f4 (diff) | |
| download | android_external_wpa_supplicant_8-376e1c49a92868fb0f2785ff01da2f5954341474.tar.gz android_external_wpa_supplicant_8-376e1c49a92868fb0f2785ff01da2f5954341474.tar.bz2 android_external_wpa_supplicant_8-376e1c49a92868fb0f2785ff01da2f5954341474.zip | |
Android: Skip explicit conf_p2p_dev loading for main interface
Bug: 17064125
Change-Id: Ib53daf22c84f2581b499462dc09a74ccfbac226a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index f20bc622..9d21fe0f 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 */ /* |