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 <johannes.berg@intel.com>

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 0eaa1f48efa7a2897e3c1711bfc7ce11269a01a4..08f153b82a23ab9ec0e95bbc2511cf52c4b4d8da 100644 (file)
--- 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);