diff options
| author | Sunil Dutt <usdutt@qti.qualcomm.com> | 2014-10-30 17:37:46 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-04 21:36:30 -0800 |
| commit | 5e6482d61a686aa7afdfedd4e10082ed87509961 (patch) | |
| tree | 3f5541b4270075012a170a5535fa29c1700556a9 | |
| parent | c0c6db17999ba1ec4a6b4fc691981bbc2d6ba4f9 (diff) | |
| download | android_external_wpa_supplicant_8-5e6482d61a686aa7afdfedd4e10082ed87509961.tar.gz android_external_wpa_supplicant_8-5e6482d61a686aa7afdfedd4e10082ed87509961.tar.bz2 android_external_wpa_supplicant_8-5e6482d61a686aa7afdfedd4e10082ed87509961.zip | |
P2P: Delay scan operation only when P2P is not in search state
With the radio work interface in place, station interface SCAN command
was not scheduled (i.e., it got continously delayed with "Delay station
mode scan while P2P operation is in progress") when a p2p_find was
operational. Fix this be delaying station mode scan only when a P2P
operation is in progress, but not in search state.
CRs-fixed: 749465
Git-commit: e7ce54023926addb6be4442bd1a87698c57e7524
Git-repo: git://w1.fi/srv/git/hostap.git
Change-Id : I0c897ce6902833554181d72ffd9142669ce7dc61
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Change-Id: If5a53c3bd6814df8454ac4cda99d24af045040fd
| -rw-r--r-- | wpa_supplicant/scan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 40eb8d84..d9b0551a 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -593,7 +593,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) { struct wpa_supplicant *wpa_s = eloop_ctx; struct wpa_ssid *ssid; - int ret; + int ret, p2p_in_progress; struct wpabuf *extra_ie = NULL; struct wpa_driver_scan_params params; struct wpa_driver_scan_params *scan_params; @@ -646,7 +646,8 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) return; } - if (wpas_p2p_in_progress(wpa_s)) { + p2p_in_progress = wpas_p2p_in_progress(wpa_s); + if (p2p_in_progress && p2p_in_progress != 2) { wpa_dbg(wpa_s, MSG_DEBUG, "Delay station mode scan while P2P operation is in progress"); wpa_supplicant_req_scan(wpa_s, 5, 0); return; |