aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lee <michael-cy.lee@mediatek.com>2023-05-04 16:04:41 +0800
committerJohannes Berg <johannes.berg@intel.com>2023-05-16 10:18:51 -0700
commita23d7f5b2fbda114de60c4b53311e052281d7533 (patch)
tree5dec68aea80f2bf35e2c019399f84d494b2ab154
parent248e4776514bf70236e6b1a54c65aa5324c8b1eb (diff)
downloadlinux-a23d7f5b2fbda114de60c4b53311e052281d7533.tar.gz
wifi: mac80211: Abort running color change when stopping the AP
When stopping the AP, there might be a color change in progress. It should be deactivated here, or the driver might later finalize a color change on a stopped AP. Fixes: 5f9404abdf2a (mac80211: add support for BSS color change) Signed-off-by: Michael Lee <michael-cy.lee@mediatek.com> Link: https://lore.kernel.org/r/20230504080441.22958-1-michael-cy.lee@mediatek.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/cfg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c5e5f783f1371..86b2036d73ff9 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1578,9 +1578,10 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,
sdata_dereference(link->u.ap.unsol_bcast_probe_resp,
sdata);
- /* abort any running channel switch */
+ /* abort any running channel switch or color change */
mutex_lock(&local->mtx);
link_conf->csa_active = false;
+ link_conf->color_change_active = false;
if (link->csa_block_tx) {
ieee80211_wake_vif_queues(local, sdata,
IEEE80211_QUEUE_STOP_REASON_CSA);