From: Jouni Malinen Date: Thu, 1 Aug 2013 14:00:53 +0000 (+0300) Subject: Revert "P2P: Reject p2p_find while P2P connection is in progress" X-Git-Tag: aosp-kk-from-upstream~102 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85a6cdb571d08959450bb285ed39ac9c38d21374;p=thirdparty%2Fhostap.git Revert "P2P: Reject p2p_find while P2P connection is in progress" This reverts commit ce970851af76ed96d203d56c660c73ba02c99673. It turned out that this breaks lots of use cases where p2p_find is issued while already in p2p_listen state. As such, we cannot reject p2p_find this easily without checking for more specific cases. Signed-hostap: Jouni Malinen --- diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 4d03ea0de..2c363ec41 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -4746,10 +4746,8 @@ int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout, return wpa_drv_p2p_find(wpa_s, timeout, type); if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL || - wpa_s->p2p_in_provisioning || wpas_p2p_in_progress(wpa_s)) { - wpa_printf(MSG_DEBUG, "P2P: Reject p2p_find while P2P connection is in progress"); + wpa_s->p2p_in_provisioning) return -1; - } wpa_supplicant_cancel_sched_scan(wpa_s);