diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-05-29 14:04:27 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-05-31 11:25:59 +0200 |
| commit | 5e9cf0f0a3e98992184442de24253fe1b9c40f2e (patch) | |
| tree | 8a0992b11a0476167a213e85f8392b9e70d2f753 /net/wireless | |
| parent | a7528198add88a6f51b8ade17a5cf86804b8f7ee (diff) | |
| download | linux-5e9cf0f0a3e98992184442de24253fe1b9c40f2e.tar.gz linux-5e9cf0f0a3e98992184442de24253fe1b9c40f2e.tar.bz2 linux-5e9cf0f0a3e98992184442de24253fe1b9c40f2e.zip | |
cfg80211: fix 6 GHz frequencies to kHz
The updates to change to kHz frequencies and the 6 GHz
additions evidently overlapped (or rather, I didn't see
it when applying the latter), so the 6 GHz is broken.
Fix this.
Fixes: 934f4c7dd3a5 ("cfg80211: express channels with a KHz component")
Link: https://lore.kernel.org/r/20200529140425.1bf824f6911b.I4a1174916b8f5965af4366999eb9ffc7a0347470@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index df75e58eca5d..5b3b0d1222a2 100644 --- 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 MHZ_TO_KHZ(5940 + chan * 5); break; case NL80211_BAND_60GHZ: if (chan < 7) |