iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath11k: indicate scan complete for scan canceled when scan running

Browse Source 
ath11k prints "Received scan event for unknown vdev" when doing the
following test:
1. trigger scan
2. wait 0.2 second
3. iw reg set or 11d scan complete from firmware

Reason: When iw reg set or 11d scan complete, the new country code will
be set to the firmware, and the new regdomain info indicated to ath11k,
then the new channel list will be sent to the firmware. The firmware
will cancel the current scan after receiving WMI_SCAN_CHAN_LIST_CMDID
which is used for the new channel list, and the state of ath11k is
ATH11K_SCAN_RUNNING, then ath11k_get_ar_on_scan_abort() returns NULL and
ath11k_scan_event() returns at this point and does not indicate scan
completion to mac80211.

Indicate scan completion to mac80211 and get rid of the "Received scan
event for unknown vdev" print for the above case.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1

Signed-off-by: Wen Gong <wgong@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210914164226.38843-2-jouni@codeaurora.org
This commit is contained in:
Wen Gong 2021-09-28 14:00:45 +03:00 committed by Kalle Valo
parent 441b3b5911
commit c677d4b1bc
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/ath/ath11k/wmi.c
View File

@ -6289,8 +6289,9 @@ exit:
rcu_read_unlock();
}
static struct ath11k *ath11k_get_ar_on_scan_abort(struct ath11k_base *ab,
u32 vdev_id)
static struct ath11k *ath11k_get_ar_on_scan_state(struct ath11k_base *ab,
u32 vdev_id,
enum ath11k_scan_state state)
{
int i;
struct ath11k_pdev *pdev;
@ -6302,7 +6303,7 @@ static struct ath11k *ath11k_get_ar_on_scan_abort(struct ath11k_base *ab,
ar = pdev->ar;
spin_lock_bh(&ar->data_lock);
if (ar->scan.state == ATH11K_SCAN_ABORTING &&
if (ar->scan.state == state &&
ar->scan.vdev_id == vdev_id) {
spin_unlock_bh(&ar->data_lock);
return ar;
@ -6332,10 +6333,15 @@ static void ath11k_scan_event(struct ath11k_base *ab, struct sk_buff *skb)
* aborting scan's vdev id matches this event info.
*/
if (scan_ev.event_type == WMI_SCAN_EVENT_COMPLETED &&
scan_ev.reason == WMI_SCAN_REASON_CANCELLED)
ar = ath11k_get_ar_on_scan_abort(ab, scan_ev.vdev_id);
else
scan_ev.reason == WMI_SCAN_REASON_CANCELLED) {
ar = ath11k_get_ar_on_scan_state(ab, scan_ev.vdev_id,
ATH11K_SCAN_ABORTING);
if (!ar)
ar = ath11k_get_ar_on_scan_state(ab, scan_ev.vdev_id,
ATH11K_SCAN_RUNNING);
} else {
ar = ath11k_mac_get_ar_by_vdev_id(ab, scan_ev.vdev_id);
}
if (!ar) {
ath11k_warn(ab, "Received scan event for unknown vdev");