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

Commit 77c45270 authored by Amar Singhal's avatar Amar Singhal Committed by Vamsi Krishna
Browse files

BACKPORT: cfg80211: Adjust 6 GHz frequency to channel conversion 



Adjust the 6 GHz frequency to channel conversion function,
the other way around was previously handled.

Signed-off-by: default avatarAmar Singhal <asinghal@codeaurora.org>
Link: https://lore.kernel.org/r/1592599921-10607-1-git-send-email-asinghal@codeaurora.org


[rewrite commit message, hard-code channel 2]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>

Bug: 167126230
(cherry picked from commit 2d9b55508556ccee6410310fb9ea2482fd3328eb)
Change-Id: Ieb788ea5a5ad614651c1a2c83d2c0fc16a98e00f
Signed-off-by: default avatarVamsi Krishna <vamsin@codeaurora.org>
parent 62b6e96e

net/wireless/util.c

+5 −3
Original line number Diff line number Diff line
@@ -121,11 +121,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 < 5945)

	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.22.2 */

		return (freq - 5950) / 5;

	else if (freq >= 58320 && freq <= 70200)

		return (freq - 56160) / 2160;

	else