From: John Crispin <john@xxxxxxxxxxx> Trigger ieee80211_csa_finish() on the non-transmitting interfaces when channel switch concludes on the transmitting interface. Signed-off-by: John Crispin <john@xxxxxxxxxxx> Co-developed-by: Aloka Dixit <alokad@xxxxxxxxxxxxxx> Signed-off-by: Aloka Dixit <alokad@xxxxxxxxxxxxxx> --- v11: Reverted changes from v10. v10: Used iflist_mtx instead of rcu_read_lock() as most other accesses to sdata->local->interfaces do so. net/mac80211/cfg.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index c95c5aacfbfa..6e1d525bf736 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3244,8 +3244,19 @@ void ieee80211_csa_finish(struct ieee80211_vif *vif) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); - ieee80211_queue_work(&sdata->local->hw, - &sdata->csa_finalize_work); + if (vif->mbssid_tx_vif == vif) { + struct ieee80211_sub_if_data *child, *tmp; + + list_for_each_entry_safe(child, tmp, + &sdata->local->interfaces, list) + if (child != sdata && child->vif.mbssid_tx_vif == vif && + ieee80211_sdata_running(child)) { + ieee80211_queue_work(&child->local->hw, + &child->csa_finalize_work); + } + } + + ieee80211_queue_work(&sdata->local->hw, &sdata->csa_finalize_work); } EXPORT_SYMBOL(ieee80211_csa_finish); -- 2.31.1