projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a65d4bac GKH |
1 | From foo@baz Sat Jul 28 10:25:26 CEST 2018 |
| 2 | From: Sven Eckelmann <sven.eckelmann@openmesh.com> | |
| 3 | Date: Wed, 23 May 2018 11:09:53 +0300 | |
| 4 | Subject: ath: Add regulatory mapping for Bahamas | |
| 5 | ||
| 6 | From: Sven Eckelmann <sven.eckelmann@openmesh.com> | |
| 7 | ||
| 8 | [ Upstream commit 699e2302c286a14afe7b7394151ce6c4e1790cc1 ] | |
| 9 | ||
| 10 | The country code is used by the ath to detect the ISO 3166-1 alpha-2 name | |
| 11 | and to select the correct conformance test limits (CTL) for a country. If | |
| 12 | the country isn't available and it is still programmed in the EEPROM then | |
| 13 | it will cause an error and stop the initialization with: | |
| 14 | ||
| 15 | Invalid EEPROM contents | |
| 16 | ||
| 17 | The current CTL mappings for this country are: | |
| 18 | ||
| 19 | * 2.4GHz: ETSI | |
| 20 | * 5GHz: FCC | |
| 21 | ||
| 22 | Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com> | |
| 23 | Signed-off-by: Kalle Valo <kvalo@codeaurora.org> | |
| 24 | Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> | |
| 25 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 26 | --- | |
| 27 | drivers/net/wireless/ath/regd.h | 1 + | |
| 28 | drivers/net/wireless/ath/regd_common.h | 1 + | |
| 29 | 2 files changed, 2 insertions(+) | |
| 30 | ||
| 31 | --- a/drivers/net/wireless/ath/regd.h | |
| 32 | +++ b/drivers/net/wireless/ath/regd.h | |
| 33 | @@ -68,6 +68,7 @@ enum CountryCode { | |
| 34 | CTRY_AUSTRALIA = 36, | |
| 35 | CTRY_AUSTRIA = 40, | |
| 36 | CTRY_AZERBAIJAN = 31, | |
| 37 | + CTRY_BAHAMAS = 44, | |
| 38 | CTRY_BAHRAIN = 48, | |
| 39 | CTRY_BANGLADESH = 50, | |
| 40 | CTRY_BARBADOS = 52, | |
| 41 | --- a/drivers/net/wireless/ath/regd_common.h | |
| 42 | +++ b/drivers/net/wireless/ath/regd_common.h | |
| 43 | @@ -306,6 +306,7 @@ static struct country_code_to_enum_rd al | |
| 44 | {CTRY_AUSTRALIA2, FCC6_WORLD, "AU"}, | |
| 45 | {CTRY_AUSTRIA, ETSI1_WORLD, "AT"}, | |
| 46 | {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ"}, | |
| 47 | + {CTRY_BAHAMAS, FCC3_WORLD, "BS"}, | |
| 48 | {CTRY_BAHRAIN, APL6_WORLD, "BH"}, | |
| 49 | {CTRY_BANGLADESH, NULL1_WORLD, "BD"}, | |
| 50 | {CTRY_BARBADOS, FCC2_WORLD, "BB"}, |