commit 6030c7c6c76560969e5f020cf60eebd706fb35fb
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 16 19:53:19 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 16 19:53:19 2019 +0000
tree 5817b73dbc6eae3e68e00bf0d54bafa33dddc05d
parent 53b5809f31bdbaa104591f7c82cb618698289e6a
parent 5ef7aadfa3f95fdc1778e5aa96222cd21d793fea

Merge "p2p: continue listening next request if no post-PD operations"

src/p2p/p2p.c

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index e8e2538..0396312 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -3456,12 +3456,18 @@
 
 	p2p->pending_action_state = P2P_NO_PENDING_ACTION;
 
-	if (!success)
+	if (!success) {
+		if (p2p->state == P2P_SEARCH)
+			p2p_continue_find(p2p);
 		return;
+	}
 
 	if (!p2p->cfg->prov_disc_resp_cb ||
-	    p2p->cfg->prov_disc_resp_cb(p2p->cfg->cb_ctx) < 1)
+	    p2p->cfg->prov_disc_resp_cb(p2p->cfg->cb_ctx) < 1) {
+		if (p2p->state == P2P_SEARCH)
+			p2p_continue_find(p2p);
 		return;
+	}
 
 	p2p_dbg(p2p,
 		"Post-Provision Discovery operations started - do not try to continue other P2P operations");