From: Jouni Malinen <j@w1.fi>
Date: Fri, 14 Sep 2012 01:05:55 +0000 (-0700)
Subject: P2P: Schedule new scan if P2P operation delays scan
X-Git-Tag: android-x86-4.4-r1~66^2~9^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fa08f9eb31989e0973eb8ed0bd14c238be19ab0b;p=android-x86%2Fexternal-wpa_supplicant_8.git

P2P: Schedule new scan if P2P operation delays scan

This makes sure that the interrupted station mode scan can be completed
after the P2P operations have had their chance of using the radio.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

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 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
 		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;
 		}
 	}