diff options
| -rw-r--r-- | wpa_supplicant/scan.c | 11 | ||||
| -rw-r--r-- | wpa_supplicant/scan.h | 1 | ||||
| -rw-r--r-- | wpa_supplicant/sme.c | 2 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 2 |
4 files changed, 16 insertions, 0 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 00d2b5e1..58b6561d 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -2459,3 +2459,14 @@ int wpas_mac_addr_rand_scan_set(struct wpa_supplicant *wpa_s, wpa_s->mac_addr_rand_enable |= type; return 0; } + + +int wpas_abort_ongoing_scan(struct wpa_supplicant *wpa_s) +{ + if (wpa_s->scan_work && wpa_s->own_scan_running) { + wpa_dbg(wpa_s, MSG_DEBUG, "Abort an ongoing scan"); + return wpa_drv_abort_scan(wpa_s); + } + + return 0; +} diff --git a/wpa_supplicant/scan.h b/wpa_supplicant/scan.h index 7650f5a2..0f1c8e49 100644 --- a/wpa_supplicant/scan.h +++ b/wpa_supplicant/scan.h @@ -54,5 +54,6 @@ void wpas_mac_addr_rand_scan_clear(struct wpa_supplicant *wpa_s, int wpas_mac_addr_rand_scan_set(struct wpa_supplicant *wpa_s, unsigned int type, const u8 *addr, const u8 *mask); +int wpas_abort_ongoing_scan(struct wpa_supplicant *wpa_s); #endif /* SCAN_H */ diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c index 54bb6c94..39965de0 100644 --- a/wpa_supplicant/sme.c +++ b/wpa_supplicant/sme.c @@ -632,6 +632,8 @@ void sme_authenticate(struct wpa_supplicant *wpa_s, radio_remove_works(wpa_s, "sme-connect", 0); } + wpas_abort_ongoing_scan(wpa_s); + cwork = os_zalloc(sizeof(*cwork)); if (cwork == NULL) return; diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 3cd183ec..c57fe492 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1694,6 +1694,8 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s, return; } + wpas_abort_ongoing_scan(wpa_s); + cwork = os_zalloc(sizeof(*cwork)); if (cwork == NULL) return; |