ath: Add regulatory mapping for Bahamas

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: FCC

Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
index 5d80be213fac0ec9c05d01bc49c6bfd190e68a16..f296ff838d2aca0922eb992fee0d3f5e8d14270d 100644 (file)
--- a/drivers/net/wireless/ath/regd.h
+++ b/drivers/net/wireless/ath/regd.h
@@ -68,6 +68,7 @@ enum CountryCode {
        CTRY_AUSTRALIA = 36,
        CTRY_AUSTRIA = 40,
        CTRY_AZERBAIJAN = 31,
+       CTRY_BAHAMAS = 44,
        CTRY_BAHRAIN = 48,
        CTRY_BANGLADESH = 50,
        CTRY_BARBADOS = 52,

diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h
index bdd2b4d61f2f0f797dc40f9fe49b5d549ed6c129..cde0268cbed6d50be86452c01e0e79efe995cae8 100644 (file)
--- a/drivers/net/wireless/ath/regd_common.h
+++ b/drivers/net/wireless/ath/regd_common.h
@@ -298,6 +298,7 @@ static struct country_code_to_enum_rd allCountries[] = {
        {CTRY_AUSTRALIA2, FCC6_WORLD, "AU"},
        {CTRY_AUSTRIA, ETSI1_WORLD, "AT"},
        {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ"},
+       {CTRY_BAHAMAS, FCC3_WORLD, "BS"},
        {CTRY_BAHRAIN, APL6_WORLD, "BH"},
        {CTRY_BANGLADESH, NULL1_WORLD, "BD"},
        {CTRY_BARBADOS, FCC2_WORLD, "BB"},