diff options
| -rw-r--r-- | src/p2p/p2p.c | 12 | ||||
| -rw-r--r-- | wpa_supplicant/events.c | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 5dc874f..a515949 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -1050,6 +1050,18 @@ int p2p_find(struct p2p_data *p2p, unsigned int timeout, return res; } +#ifdef ANDROID_P2P +int p2p_search_pending(struct p2p_data *p2p) +{ + if(p2p == NULL) + return 0; + + if(p2p->state == P2P_SEARCH_WHEN_READY) + return 1; + + return 0; +} +#endif int p2p_other_scan_completed(struct p2p_data *p2p) { diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 2f7b194..2ad0ec5 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -1065,7 +1065,11 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s, wpa_supplicant_notify_scanning(wpa_s, 0); #ifdef CONFIG_P2P +#ifdef ANDROID_P2P + if (p2p_search_pending(wpa_s->global->p2p) && !wpa_s->global->p2p_disabled && +#else if (wpa_s->p2p_cb_on_scan_complete && !wpa_s->global->p2p_disabled && +#endif wpa_s->global->p2p != NULL) { wpa_s->p2p_cb_on_scan_complete = 0; if (p2p_other_scan_completed(wpa_s->global->p2p) == 1) { |