]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
Revert "P2P: Reject p2p_find while P2P connection is in progress"
authorJouni Malinen <j@w1.fi>
Thu, 1 Aug 2013 14:00:53 +0000 (17:00 +0300)
committerJouni Malinen <j@w1.fi>
Thu, 1 Aug 2013 14:03:06 +0000 (17:03 +0300)
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 <j@w1.fi>

wpa_supplicant/p2p_supplicant.c

index 4d03ea0de701f921ad4a83e678d1a14c55202acc..2c363ec41c81910b72f5e1167193890286545978 100644 (file)
@@ -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);