diff options
Diffstat (limited to 'wpa_supplicant/wpa_supplicant.c')
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 73ffde8..39630ad 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2375,11 +2375,8 @@ int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s) wpa_s->prev_scan_wildcard = 0; if (wpa_supplicant_enabled_networks(wpa_s)) { -#ifdef ANDROID - wpa_supplicant_req_scan(wpa_s, wpa_s->scan_interval, 0); -#else - wpa_supplicant_req_scan(wpa_s, interface_count, 100000); -#endif + wpa_supplicant_delayed_sched_scan(wpa_s, + interface_count, 100000); interface_count++; } else wpa_supplicant_set_state(wpa_s, WPA_INACTIVE); @@ -2849,6 +2846,11 @@ next_driver: #ifdef CONFIG_P2P #ifdef ANDROID + if (os_strncmp(iface->ifname, "wlan0", 4) == 0) { + wpa_printf(MSG_DEBUG, "Disable P2P on wlan0"); + wpa_s->conf->p2p_disabled = 1; + } + if (os_strncmp(iface->ifname, "p2p0", 4) == 0) #endif /* ANDROID */ if (wpas_p2p_init(wpa_s->global, wpa_s) < 0) { |