cfg80211: add 6GHz UNII band definitions

For the new 6GHz there are new UNII band definitions as listed
in the FCC notice [1].

[1] https://docs.fcc.gov/public/attachments/FCC-18-147A1_Rcd.pdf

Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Leon Zegers <leon.zegers@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://lore.kernel.org/r/1564745465-21234-3-git-send-email-arend.vanspriel@broadcom.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 4831ad745f912dd0e82e0a87b49414a175a28c68..646107af9f411576ccbb5eefd6b110601d65ea0f 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -3806,8 +3806,9 @@ void wiphy_regulatory_deregister(struct wiphy *wiphy)
 }
 
 /*
- * See http://www.fcc.gov/document/5-ghz-unlicensed-spectrum-unii, for
- * UNII band definitions
+ * See FCC notices for UNII band definitions
+ *  5GHz: https://www.fcc.gov/document/5-ghz-unlicensed-spectrum-unii
+ *  6GHz: https://www.fcc.gov/document/fcc-proposes-more-spectrum-unlicensed-use-0
  */
 int cfg80211_get_unii(int freq)
 {
@@ -3831,6 +3832,22 @@ int cfg80211_get_unii(int freq)
        if (freq > 5725 && freq <= 5825)
                return 4;
 
+       /* UNII-5 */
+       if (freq > 5925 && freq <= 6425)
+               return 5;
+
+       /* UNII-6 */
+       if (freq > 6425 && freq <= 6525)
+               return 6;
+
+       /* UNII-7 */
+       if (freq > 6525 && freq <= 6875)
+               return 7;
+
+       /* UNII-8 */
+       if (freq > 6875 && freq <= 7125)
+               return 8;
+
        return -EINVAL;
 }