ath: Add regulatory mapping for Serbia

[ Upstream commit 2a3169a54bb53717928392a04fb84deb765b51f1 ]

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: ETSI
* 5GHz: ETSI

Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
index 74f745d9fab3463fd45cff1608b8156e9149f7c6..b5764a38f90c052d13a191d3641eddf782450d42 100644 (file)
--- a/drivers/net/wireless/ath/regd.h
+++ b/drivers/net/wireless/ath/regd.h
@@ -159,6 +159,7 @@ enum CountryCode {
        CTRY_ROMANIA = 642,
        CTRY_RUSSIA = 643,
        CTRY_SAUDI_ARABIA = 682,
+       CTRY_SERBIA = 688,
        CTRY_SERBIA_MONTENEGRO = 891,
        CTRY_SINGAPORE = 702,
        CTRY_SLOVAKIA = 703,

diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h
index b85dc86cc1889a4ffce8750e7570582cdf75676e..1ced5a323cf8e4e469b2c889f27315165c8c5cce 100644 (file)
--- a/drivers/net/wireless/ath/regd_common.h
+++ b/drivers/net/wireless/ath/regd_common.h
@@ -452,6 +452,7 @@ static struct country_code_to_enum_rd allCountries[] = {
        {CTRY_ROMANIA, NULL1_WORLD, "RO"},
        {CTRY_RUSSIA, NULL1_WORLD, "RU"},
        {CTRY_SAUDI_ARABIA, NULL1_WORLD, "SA"},
+       {CTRY_SERBIA, ETSI1_WORLD, "RS"},
        {CTRY_SERBIA_MONTENEGRO, ETSI1_WORLD, "CS"},
        {CTRY_SINGAPORE, APL6_WORLD, "SG"},
        {CTRY_SLOVAKIA, ETSI1_WORLD, "SK"},