--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
-@@ -76,6 +76,7 @@ bool ieee80211_set_channel_type(struct i
-
+@@ -77,6 +77,9 @@ bool ieee80211_set_channel_type(struct i
switch (tmp->vif.bss_conf.channel_type) {
case NL80211_CHAN_NO_HT:
-+ break;
case NL80211_CHAN_HT20:
++ if (superchan > tmp->vif.bss_conf.channel_type)
++ break;
++
superchan = tmp->vif.bss_conf.channel_type;
break;
+ case NL80211_CHAN_HT40PLUS: