diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:43:52 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:49:36 +0300 |
| commit | 10f5ae21940cc754f82828d81b8009f2e8ae2c64 (patch) | |
| tree | 8156f045504a2f9e1d767b0af6f89b19a4de2e52 /net/mac80211/cfg.c | |
| parent | 7d528eafc5290bed18551a22ff25ce8587b603e0 (diff) | |
| parent | f7e60032c6618dfd643c7210d5cba2789e2de2e2 (diff) | |
| download | linux-10f5ae21940cc754f82828d81b8009f2e8ae2c64.tar.xz | |
Merge wireless into wireless-next
There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 801aaa62b68f..cf090abda400 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1583,9 +1583,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); |