cfg80211: Add support for 60GHz band channels 5 and 6

The current support in the 60GHz band is for channels 1-4.
Add support for channels 5 and 6.
This requires enlarging ieee80211_channel.center_freq from u16 to u32.

Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 7bdcfe19b3ef..2a89db5f2db7 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -88,7 +88,7 @@ int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
                         return 5000 + chan * 5;
                 break;
         case NL80211_BAND_60GHZ:
-                if (chan < 5)
+                if (chan < 7)
                         return 56160 + chan * 2160;
                 break;
         default:
@@ -109,7 +109,7 @@ int ieee80211_frequency_to_channel(int freq)
                 return (freq - 4000) / 5;
         else if (freq <= 45000) /* DMG band lower limit */
                 return (freq - 5000) / 5;
-        else if (freq >= 58320 && freq <= 64800)
+        else if (freq >= 58320 && freq <= 70200)
                 return (freq - 56160) / 2160;
         else
                 return 0;
@@ -1568,7 +1568,7 @@ bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef,
         }
 
         /* 56.16 GHz, channel 1..4 */
-        if (freq >= 56160 + 2160 * 1 && freq <= 56160 + 2160 * 4) {
+        if (freq >= 56160 + 2160 * 1 && freq <= 56160 + 2160 * 6) {
                 if (chandef->width >= NL80211_CHAN_WIDTH_40)
                         return false;