From: Adam Baumann Date: Thu, 27 Mar 2025 02:57:27 +0000 (+1100) Subject: DPP: Stop scheduled scans from blocking the PB discovery scan X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71ac0d2522d545e50bc45745a24f572773dcb8be;p=thirdparty%2Fhostap.git DPP: Stop scheduled scans from blocking the PB discovery scan DPP PB interactions cannot start during a scheduled scan as the initial discovery scan will be blocked indefinitely. This can be fixed by canceling an ongoing scheduled scan before performing the DPP PB discovery scan. Signed-off-by: Adam Baumann --- diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c index 3feb4ccb6..bdb3e2b9a 100644 --- a/wpa_supplicant/dpp_supplicant.c +++ b/wpa_supplicant/dpp_supplicant.c @@ -5767,6 +5767,7 @@ int wpas_dpp_push_button(struct wpa_supplicant *wpa_s, const char *cmd) "DPP: Scan to create channel list for PB discovery"); wpa_s->scan_req = MANUAL_SCAN_REQ; wpa_s->scan_res_handler = wpas_dpp_pb_scan_res_handler; + wpa_supplicant_cancel_sched_scan(wpa_s); wpa_supplicant_req_scan(wpa_s, 0, 0); wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_PB_STATUS "started"); return 0;