diff options
| author |   Arend Van Spriel <arend.vanspriel@broadcom.com> | 2020-05-29 11:41:43 +0200 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2020-05-31 11:26:03 +0200 |
| commit | d1a1646c0de7b0083d42a1ada72a3ec243bfcc6d (patch) | |
| tree | 0d71f1151e44f08937ed9dea5ce96cb1dfb95d75 /net/wireless/util.c | |
| parent | cfg80211: fix 6 GHz frequencies to kHz (diff) | |
| download | linux-dev-d1a1646c0de7b0083d42a1ada72a3ec243bfcc6d.tar.xz linux-dev-d1a1646c0de7b0083d42a1ada72a3ec243bfcc6d.zip | |
cfg80211: adapt to new channelization of the 6GHz band
The 6GHz band does not have regulatory approval yet, but things are
moving forward. However, that has led to a change in the channelization
of the 6GHz band which has been accepted in the 11ax specification. It
also fixes a missing MHZ_TO_KHZ() macro for 6GHz channels while at it.
This change is primarily thrown in to discuss how to deal with it.
I noticed ath11k adding 6G support with old channelization and ditto
for iw. It probably involves changes in hostapd as well.
Cc: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Cc: Jouni Malinen <jouni@w1.fi>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://lore.kernel.org/r/edf07cdd-ad15-4012-3afd-d8b961a80b69@broadcom.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | net/wireless/util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 5b3b0d1222a2..a27d4f45fb5f 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -92,9 +92,11 @@ u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band) return MHZ_TO_KHZ(5000 + chan * 5); break; case NL80211_BAND_6GHZ: - /* see 802.11ax D4.1 27.3.22.2 */ + /* see 802.11ax D6.1 27.3.23.2 */ + if (chan == 2) + return MHZ_TO_KHZ(5935); if (chan <= 253) - return MHZ_TO_KHZ(5940 + chan * 5); + return MHZ_TO_KHZ(5950 + chan * 5); break; case NL80211_BAND_60GHZ: if (chan < 7) |