commit f9edc4227fe7a1f2450144c4d79ec9924be7f3da
author Jouni Malinen <j@w1.fi> Fri Sep 14 14:13:57 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 14 14:13:57 2012 -0700
tree 3d8d63b373717de32103af1630dc9cc8b5b75b86
parent 0f9a57d4d1e5ace585d4efd905207b02ac16d088
parent fa08f9eb31989e0973eb8ed0bd14c238be19ab0b

am fa08f9eb: P2P: Schedule new scan if P2P operation delays scan

* commit 'fa08f9eb31989e0973eb8ed0bd14c238be19ab0b':
  P2P: Schedule new scan if P2P operation delays scan

wpa_supplicant/events.c

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 093ab0d..b030a73 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1064,6 +1064,8 @@
 		if (p2p_other_scan_completed(wpa_s->global->p2p) == 1) {
 			wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Pending P2P operation "
 				"stopped scan processing");
+			wpa_s->sta_scan_pending = 1;
+			wpa_supplicant_req_scan(wpa_s, 5, 0);
 			return -1;
 		}
 	}