diff options
author | Eyal Shapira | 2011-12-18 01:18:22 -0600 |
---|---|---|
committer | Arik Nemtsov | 2012-03-13 11:39:37 -0500 |
commit | 08cd3bdd5bf78692388076562c7547bfd59794f4 (patch) | |
tree | a0dfe97e67c3eb0b0637e7711f3cfa9763808f4a | |
parent | 184e7c25dad2898c097f0f8ba8fac31bd25c70b8 (diff) | |
download | hostap-08cd3bdd5bf78692388076562c7547bfd59794f4.tar.gz hostap-08cd3bdd5bf78692388076562c7547bfd59794f4.tar.xz hostap-08cd3bdd5bf78692388076562c7547bfd59794f4.zip |
sched scan: Continue to scan even if previous scan cancel fails
cancel_sched_scan might fail if there wasn't any scan going
on before. This shouldn't stop a new sched scan attempt.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
-rw-r--r-- | wpa_supplicant/scan.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 92854213..b3ca93cc 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c | |||
@@ -800,10 +800,14 @@ int wpa_supplicant_req_sched_scan(struct wpa_supplicant *wpa_s) | |||
800 | } | 800 | } |
801 | 801 | ||
802 | if (wpa_s->sched_scanning) { | 802 | if (wpa_s->sched_scanning) { |
803 | wpa_dbg(wpa_s, MSG_DEBUG, "Cancel previous sched scan"); | 803 | wpa_dbg(wpa_s, MSG_DEBUG, |
804 | wpa_s->override_sched_scan = 1; | 804 | "Restarting sched scan with new parameters"); |
805 | wpa_supplicant_cancel_sched_scan(wpa_s); | 805 | ret = wpa_supplicant_cancel_sched_scan(wpa_s); |
806 | return 0; | 806 | if (!ret) { |
807 | wpa_s->override_sched_scan = 1; | ||
808 | return 0; | ||
809 | } | ||
810 | /* If failed probably no scan running so continu */ | ||
807 | } | 811 | } |
808 | 812 | ||
809 | wpa_s->override_sched_scan = 0; | 813 | wpa_s->override_sched_scan = 0; |