Thread (56 messages) 56 messages, 2 authors, 2018-05-25

[PATCH 03/52] ath: Add regulatory mapping for Japan (J56)

flat view
STALE3072d

From: Sven Eckelmann <hidden>
Date: 2018-03-01 14:20:36
Subsystem: atheros ath generic utilities, the rest · Maintainers: Jeff Johnson, Linus Torvalds

The country code is used by the ath to detect the ISO 3166-1 alpha-2 name
and to select the correct conformance test limits (CTL) for a country. If
the country isn't available and it is still programmed in the EEPROM then
it will cause an error and stop the initialization with:

  Invalid EEPROM contents

The current CTL mappings for this country are:

* 2.4GHz: FCC
* 5GHz: MKK

Signed-off-by: Sven Eckelmann <redacted>
---
 drivers/net/wireless/ath/regd_common.h | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h
index a8c7f306fd7b..bba2d156cb21 100644
--- a/drivers/net/wireless/ath/regd_common.h
+++ b/drivers/net/wireless/ath/regd_common.h
@@ -99,6 +99,7 @@ enum EnumRd {
 	MKK5_MKKB = 0x86,
 	MKK5_MKKA2 = 0x87,
 	MKK5_MKKC = 0x88,
+	MKK5_FCCA = 0x9A,
 
 	MKK6_MKKB = 0x89,
 	MKK6_MKKA2 = 0x8A,
@@ -226,6 +227,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = {
 	{MKK5_MKKB, CTL_MKK, CTL_MKK},
 	{MKK5_MKKA2, CTL_MKK, CTL_MKK},
 	{MKK5_MKKC, CTL_MKK, CTL_MKK},
+	{MKK5_FCCA, CTL_MKK, CTL_FCC},
 
 	{MKK6_MKKB, CTL_MKK, CTL_MKK},
 	{MKK6_MKKA1, CTL_MKK, CTL_MKK},
@@ -405,6 +407,7 @@ static struct country_code_to_enum_rd allCountries[] = {
 	{CTRY_JAPAN52, MKK12_MKKA1, "JP"},
 	{CTRY_JAPAN53, MKK12_MKKC, "JP"},
 	{CTRY_JAPAN54, MKK12_MKKA2, "JP"},
+	{CTRY_JAPAN56, MKK5_FCCA, "JP"},
 	{CTRY_JAPAN57, MKK13_MKKB, "JP"},
 	{CTRY_JAPAN58, MKK14_MKKA1, "JP"},
 	{CTRY_JAPAN59, MKK15_MKKA1, "JP"},
-- 
2.11.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help