diff options
| author | qctecmdr <qctecmdr@localhost> | 2020-09-15 04:47:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-09-15 04:47:23 -0700 |
| commit | 9d79a981956493d5833889a0c34b36d6efed1196 (patch) | |
| tree | e06197876365f12167479ee575c5d8ecc5b95cde | |
| parent | 7f6e58f814f815b281d56143fabf91a984984b3c (diff) | |
| parent | d26d3d0f6b1c59d2848c73ce2d50934a8af360bd (diff) | |
Merge "cfg80211: Adjust 6 GHz frequency to channel conversion"LA.UM.8.12.c3-15000-sm8250.0
| -rw-r--r-- | net/wireless/util.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 9a99dbe9b422..8a42769f1c91 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -117,11 +117,13 @@ 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 < 5940) + else if (freq < 5925) return (freq - 5000) / 5; + else if (freq == 5935) + return 2; else if (freq <= 45000) /* DMG band lower limit */ - /* see 802.11ax D4.1 27.3.22.2 */ - return (freq - 5940) / 5; + /* see 802.11ax D6.1 27.3.23.2 */ + return (freq - 5950) / 5; else if (freq >= 58320 && freq <= 70200) return (freq - 56160) / 2160; else |