Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b183ad authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

wireless: fix regulatory HT40 allowed check 



commit 1a919318 "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: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 75e6934a

net/wireless/reg.c

+3 −1
Original line number Diff line number Diff line
@@ -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,