]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel
authorYingying Tang <yingying.tang@oss.qualcomm.com>
Mon, 12 Jan 2026 11:55:16 +0000 (19:55 +0800)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Tue, 13 Jan 2026 15:25:02 +0000 (07:25 -0800)
commit8b8d6ee53dfdee61b0beff66afe3f712456e707a
treeaf5aa73ffaaeb3fbdc97dd3b88ef87a0c9ae6b8c
parent39c90b1a1dbe6d7c49d19da6e5aec00980c55d8b
wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel

Scan finish workqueue was introduced in __ath12k_mac_scan_finish() by [1].

During ath12k_mac_op_cancel_remain_on_channel(), scan state is set to
ABORTING and should be reset to IDLE in the queued work. However,
wiphy_work_cancel() is called before exiting
ath12k_mac_op_cancel_remain_on_channel(), which prevents the work
from running and leaves the state in ABORTING. This blocks all
subsequent scan requests.

Replace wiphy_work_cancel() with wiphy_work_flush() to ensure the
queued work runs and scan state is reset to IDLE.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3

Fixes: 3863f014ad23 ("wifi: ath12k: symmetrize scan vdev creation and deletion during HW scan") # [1]
Signed-off-by: Yingying Tang <yingying.tang@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Link: https://patch.msgid.link/20260112115516.2144219-1-yingying.tang@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath12k/mac.c