From a503a9535eb83afcbdcba7696b4bc7a1e17f93f2 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 8 Jun 2022 14:18:17 +0200 Subject: [PATCH] wifi: mac80211: ignore IEEE80211_CONF_CHANGE_SMPS in chanctx mode When channel contexts are used, IEEE80211_CONF_CHANGE_SMPS doesn't make sense and doesn't apply (which is documented). Mask it in this case. Signed-off-by: Johannes Berg --- net/mac80211/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 0eaa1f48efa7a..08f153b82a23a 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -175,7 +175,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) changed |= ieee80211_hw_conf_chan(local); else changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL | - IEEE80211_CONF_CHANGE_POWER); + IEEE80211_CONF_CHANGE_POWER | + IEEE80211_CONF_CHANGE_SMPS); if (changed && local->open_count) { ret = drv_config(local, changed);