wireless: fix regulatory HT40 allowed check

commit 1a9193185f462a51815fe48491f8a6fb6b942551 "regulatory: code cleanup"
changed is_ht40_allowed without considering that IEEE80211_CHAN_NO_HT40 is
not just one flag, but two.
This is causing HT40- to be blocked completely.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 8c114e8..6ea626b 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1123,7 +1123,9 @@ static bool is_ht40_allowed(struct ieee80211_channel *chan)
        if (chan->flags & IEEE80211_CHAN_DISABLED)
                return false;
        /* This would happen when regulatory rules disallow HT40 completely */
-       return !(chan->flags & IEEE80211_CHAN_NO_HT40);
+       if ((chan->flags & IEEE80211_CHAN_NO_HT40) == IEEE80211_CHAN_NO_HT40)
+               return false;
+       return true;
 }
 
 static void reg_process_ht_flags_channel(struct wiphy *wiphy,