]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
P2P: Fix disallowing of pending listen command to override connect
authorJouni Malinen <jouni@qca.qualcomm.com>
Mon, 16 Apr 2012 15:51:33 +0000 (18:51 +0300)
committerJouni Malinen <j@w1.fi>
Mon, 16 Apr 2012 15:51:33 +0000 (18:51 +0300)
Commit d9bdba9f867577ed9da6df9c5c933033c71bcdf2 was supposed to allow
p2p_listen to schedule new after scan operation only if a p2p_connect
operation was not pending. However, it used incorrect P2P_AFTER_SCAN_
value for this and did not actually prevent overriding of p2p_connect
and could have caused some p2p_listen operations to be skipped
unnecessarily.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
intended-for: hostap-1

src/p2p/p2p.c

index a0da48fdd36eb612fef5b9ac111765a6e698a6c3..a23ccafe082b140d6b834acf2764fd7fac5a67c9 100644 (file)
@@ -273,7 +273,7 @@ int p2p_listen(struct p2p_data *p2p, unsigned int timeout)
        p2p->pending_listen_usec = (timeout % 1000) * 1000;
 
        if (p2p->p2p_scan_running) {
-               if (p2p->start_after_scan == P2P_AFTER_SCAN_NOTHING) {
+               if (p2p->start_after_scan == P2P_AFTER_SCAN_CONNECT) {
                        wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
                                "P2P: p2p_scan running - connect is already "
                                "pending - skip listen");