From: Arend van Spriel <arend.vanspriel@broadcom.com>
Date: Tue, 3 Sep 2019 11:39:32 +0000 (+0200)
Subject: cfg80211: fix boundary value in ieee80211_frequency_to_channel()
X-Git-Tag: v5.4-rc1~131^2~39^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=df5d7a88bc9409aff60f67d82ee25715fa48a22d;p=users%2Fjedix%2Flinux-maple.git

cfg80211: fix boundary value in ieee80211_frequency_to_channel()

The boundary value used for the 6G band was incorrect as it would
result in invalid 6G channel number for certain frequencies.

Reported-by: Amar Singhal <asinghal@codeaurora.org>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://lore.kernel.org/r/1567510772-24263-1-git-send-email-arend.vanspriel@broadcom.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/util.c b/net/wireless/util.c
index c99939067bb0..006f3eac00f7 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -116,7 +116,7 @@ int ieee80211_frequency_to_channel(int freq)
 		return (freq - 2407) / 5;
 	else if (freq >= 4910 && freq <= 4980)
 		return (freq - 4000) / 5;
-	else if (freq < 5940)
+	else if (freq < 5945)
 		return (freq - 5000) / 5;
 	else if (freq <= 45000) /* DMG band lower limit */
 		/* see 802.11ax D4.1 27.3.22.2 */