From 5b9cecafaf8c14c056d92b652ee91b83187ec3e5 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 16 Apr 2012 18:51:33 +0300 Subject: [PATCH] P2P: Fix disallowing of pending listen command to override connect 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 intended-for: hostap-1 --- src/p2p/p2p.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index a0da48fdd..a23ccafe0 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -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");