Re: [PATCH ath-next] wifi: ath9k_htc: do not fetch the beacon of a finished countdown
From: Toke Høiland-Jørgensen
Date: Tue Nov 17 2026 - 05:25:33 EST
Mehmet Fide <mehmet.fide@xxxxxxxxx> writes:
> From: Mehmet Fide <mehmet.fide@xxxxxxxxxxxxxxxxxx>
>
> ath9k_htc_send_beacon() checks the channel switch countdown only after
> ieee80211_beacon_get(). mac80211 replaces the CSA beacon only after the
> channel change, and ath9k_htc_set_channel() re-enables beaconing before
> that, so an SWBA event can fetch the CSA beacon again on the new channel
> and mac80211 reports "beacon TX faster than countdown".
>
> Skip the beacon while the countdown is complete and finish the switch
> from there, as ath9k does for non-EDMA chips. Finishing from the skip
> also covers a count of 2, where the first fetch can complete the
> countdown before csa_vif is set.
>
> Tested on 6.12 with an AR9271 AP and hostapd chan_switch: the CSA beacon
> was fetched again in 3 of 40 switches with a count of 5 before and in
> none after, and all 60 switches with a count of 2 completed.
>
> Fixes: f0e449627e4a ("ath9k_htc: add support of channel switch")
> Signed-off-by: Mehmet Fide <mehmet.fide@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
> index 81fa7cbad892..2b5bf07511bb 100644
> --- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
> +++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
> @@ -214,6 +214,13 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv,
> return;
> }
>
> + if (vif->bss_conf.csa_active &&
> + ieee80211_beacon_cntdwn_is_complete(vif, 0)) {
> + spin_unlock_bh(&priv->beacon_lock);
> + ath9k_htc_csa_is_finished(priv);
> + return;
> + }
> +
Hmm, there's something odd going on with the locking / vif selection
here. In the snippet above, you're basically replicating the checks
inside ath9k_htc_csa_is_finished(), before then calling
ath9k_htc_csa_is_finished() itself. Which presumably then repeats the
same checks, and does the ieee80211_csa_finish()? Or at least that's
the logic for why this is correct, AFAIU, no?
But ath9k_htc_csa_is_finished() doesn't take the 'vif' from the beacon
slot, it takes the 'priv' pointer that was passed to the function. Which
implies that either:
(1) priv->csa_vif is guaranteed to be the same whenever csa_active is
set, and thus this doesn't matter, or
(2) there's a bug here and things can get mixed up.
Since there's already a call to ath9k_htc_csa_is_finished(priv) at the
end of that same function, I'm assuming it's case (1) that holds. In
which case, I don't see any reason why we can't just do an early return
before taking the lock as:
if (ath9k_htc_csa_is_finished(priv))
return;
The priv->csa_vif pointer is not protected by the beacon lock anyway[0], so
I don't think this would lead to trouble?
Thoughts?
-Toke
[0] Side note - the priv->csa_vif pointer seems to be quite
inconsistently lock-protected: it's set under priv->mutex in the driver
setup paths, under the mac80211 wiphy lock by the
channel_switch_beacon() callback, and under the wmi lock by
ath9k_htc_csa_is_finished() itself. Not quite sure if there's some other
dependency between these locks that ensures this works, or if that's
just a total coincidence...