diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2016-11-03 15:27:37 +0530 |
|---|---|---|
| committer | Nalla Kartheek <karthe@codeaurora.org> | 2016-11-03 15:28:54 +0530 |
| commit | c61abc4f0c1edd09e0653b0e6c4b2bbf4797c7e4 (patch) | |
| tree | 338cb157714fbbb96b44ec8553acd9013e79dbf2 | |
| parent | b650b72900928370e93d552497ad6c1f006a4236 (diff) | |
| download | android_external_wpa_supplicant_8-c61abc4f0c1edd09e0653b0e6c4b2bbf4797c7e4.tar.gz android_external_wpa_supplicant_8-c61abc4f0c1edd09e0653b0e6c4b2bbf4797c7e4.tar.bz2 android_external_wpa_supplicant_8-c61abc4f0c1edd09e0653b0e6c4b2bbf4797c7e4.zip | |
Share a common helper function for restarting sched_scan.
This code sequence was already used at two different places (and an
additional one has been proposed), so add a common helper function to
avoid having to copy-paste this functionality in multiple locations.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: 5bb7327a697108c880dd31c9e421df386c904b1a
Git-repo: git://w1.fi/srv/git/hostap.git
CRs-fixed: 1085011
Change-Id: I964d6625ab19736d8a4c8b1c53fa3f522a760416
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 13 | ||||
| -rw-r--r-- | wpa_supplicant/scan.c | 9 | ||||
| -rw-r--r-- | wpa_supplicant/scan.h | 1 |
3 files changed, 13 insertions, 10 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 0ab4f413..9ff6a4a9 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -8376,10 +8376,7 @@ static int wpas_ctrl_iface_mac_rand_scan(struct wpa_supplicant *wpa_s, } } else if (wpa_s->sched_scanning && (type & MAC_ADDR_RAND_SCHED_SCAN)) { - /* simulate timeout to restart the sched scan */ - wpa_s->sched_scan_timed_out = 1; - wpa_s->prev_sched_ssid = NULL; - wpa_supplicant_cancel_sched_scan(wpa_s); + wpas_scan_restart_sched_scan(wpa_s); } return 0; } @@ -8405,12 +8402,8 @@ static int wpas_ctrl_iface_mac_rand_scan(struct wpa_supplicant *wpa_s, wpas_mac_addr_rand_scan_set(wpa_s, MAC_ADDR_RAND_SCHED_SCAN, addr, mask); - if (wpa_s->sched_scanning && !wpa_s->pno) { - /* simulate timeout to restart the sched scan */ - wpa_s->sched_scan_timed_out = 1; - wpa_s->prev_sched_ssid = NULL; - wpa_supplicant_cancel_sched_scan(wpa_s); - } + if (wpa_s->sched_scanning && !wpa_s->pno) + wpas_scan_restart_sched_scan(wpa_s); } if (type & MAC_ADDR_RAND_PNO) { diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index ed156d24..76108176 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -2749,3 +2749,12 @@ void wpas_scan_reset_sched_scan(struct wpa_supplicant *wpa_s) wpa_supplicant_cancel_sched_scan(wpa_s); } } + + +void wpas_scan_restart_sched_scan(struct wpa_supplicant *wpa_s) +{ + /* simulate timeout to restart the sched scan */ + wpa_s->sched_scan_timed_out = 1; + wpa_s->prev_sched_ssid = NULL; + wpa_supplicant_cancel_sched_scan(wpa_s); +} diff --git a/wpa_supplicant/scan.h b/wpa_supplicant/scan.h index 6ea56c84..46219f6e 100644 --- a/wpa_supplicant/scan.h +++ b/wpa_supplicant/scan.h @@ -48,6 +48,7 @@ void wpa_scan_free_params(struct wpa_driver_scan_params *params); int wpas_start_pno(struct wpa_supplicant *wpa_s); int wpas_stop_pno(struct wpa_supplicant *wpa_s); void wpas_scan_reset_sched_scan(struct wpa_supplicant *wpa_s); +void wpas_scan_restart_sched_scan(struct wpa_supplicant *wpa_s); void wpas_mac_addr_rand_scan_clear(struct wpa_supplicant *wpa_s, unsigned int type); |