On Thu, May 28, 2020 at 09:34:43PM +0200, Johannes Berg wrote: > The starting frequency of the 6GHz band changed from > 5940 MHz to 5950 MHz. Update the code accordingly. > diff --git a/net/wireless/util.c b/net/wireless/util.c > @@ -94,7 +94,7 @@ u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band) > case NL80211_BAND_6GHZ: > /* see 802.11ax D4.1 27.3.22.2 */ > if (chan <= 253) > - return 5940 + chan * 5; > + return 5950 + chan * 5; It would be good to update that P802.11ax reference to point to a newer version that actually matches the changed implementation, i.e., IEEE P802.11ax/D6.1, 27.3.23.2. > @@ -119,11 +119,11 @@ int ieee80211_freq_khz_to_channel(u32 freq) > return (freq - 2407) / 5; > else if (freq >= 4910 && freq <= 4980) > return (freq - 4000) / 5; > - else if (freq < 5945) > + else if (freq < 5955) > return (freq - 5000) / 5; What about operating class 136 channel 2 with channel starting frequency of 5925 MHz? This would map 5935 MHz incorrectly. > else if (freq <= 45000) /* DMG band lower limit */ > /* see 802.11ax D4.1 27.3.22.2 */ > - return (freq - 5940) / 5; > + return (freq - 5950) / 5; Same here for the reference. -- Jouni Malinen PGP id EFC895FA
