2010-06-17 09:48:00

by Vivek Natarajan

[permalink] [raw]
Subject: [PATCH] ath: Update the regulatory domain information for a few countries.

Add Kenya(KE) with APL1_WORLD.
Change Honduras(HN) to FCC3_WORLD.
Change Lebanon(LB) to APL1_WORLD,
Change Macedonia(MK) to ETSI1_WORLD.
Change Pakistan(PK) to APL1_WORLD.
Change Romania(RO) to ETSI1_WORLD.
Change Russia(RU) to FCC3_WORLD.
Change Saudi Arabia(SA) to FCC2_WORLD.
Change UAE(AE) to ETSI1_WORLD.
Change Venezuela(VE) to FCC1_WORLD.
Change Vietnam(VN) to ETSI3_WORLD.

Signed-off-by: Vivek Natarajan <[email protected]>
---
drivers/net/wireless/ath/regd_common.h | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h
index 248c670..b59b690 100644
--- a/drivers/net/wireless/ath/regd_common.h
+++ b/drivers/net/wireless/ath/regd_common.h
@@ -333,7 +333,7 @@ static struct country_code_to_enum_rd allCountries[] = {
{CTRY_GUAM, FCC1_FCCA, "GU"},
{CTRY_GUATEMALA, FCC1_FCCA, "GT"},
{CTRY_HAITI, ETSI1_WORLD, "HT"},
- {CTRY_HONDURAS, NULL1_WORLD, "HN"},
+ {CTRY_HONDURAS, FCC3_WORLD, "HN"},
{CTRY_HONG_KONG, FCC3_WORLD, "HK"},
{CTRY_HUNGARY, ETSI1_WORLD, "HU"},
{CTRY_ICELAND, ETSI1_WORLD, "IS"},
@@ -406,18 +406,19 @@ static struct country_code_to_enum_rd allCountries[] = {

{CTRY_JORDAN, ETSI2_WORLD, "JO"},
{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ"},
+ {CTRY_KENYA, APL1_WORLD, "KE"},
{CTRY_KOREA_NORTH, APL9_WORLD, "KP"},
{CTRY_KOREA_ROC, APL9_WORLD, "KR"},
{CTRY_KOREA_ROC2, APL2_WORLD, "K2"},
{CTRY_KOREA_ROC3, APL9_WORLD, "K3"},
{CTRY_KUWAIT, ETSI3_WORLD, "KW"},
{CTRY_LATVIA, ETSI1_WORLD, "LV"},
- {CTRY_LEBANON, NULL1_WORLD, "LB"},
+ {CTRY_LEBANON, APL1_WORLD, "LB"},
{CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI"},
{CTRY_LITHUANIA, ETSI1_WORLD, "LT"},
{CTRY_LUXEMBOURG, ETSI1_WORLD, "LU"},
{CTRY_MACAU, FCC2_WORLD, "MO"},
- {CTRY_MACEDONIA, NULL1_WORLD, "MK"},
+ {CTRY_MACEDONIA, ETSI1_WORLD, "MK"},
{CTRY_MALAYSIA, APL8_WORLD, "MY"},
{CTRY_MALTA, ETSI1_WORLD, "MT"},
{CTRY_MEXICO, FCC1_FCCA, "MX"},
@@ -429,7 +430,7 @@ static struct country_code_to_enum_rd allCountries[] = {
{CTRY_NEW_ZEALAND, FCC2_ETSIC, "NZ"},
{CTRY_NORWAY, ETSI1_WORLD, "NO"},
{CTRY_OMAN, FCC3_WORLD, "OM"},
- {CTRY_PAKISTAN, NULL1_WORLD, "PK"},
+ {CTRY_PAKISTAN, APL1_WORLD, "PK"},
{CTRY_PANAMA, FCC1_FCCA, "PA"},
{CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG"},
{CTRY_PERU, APL1_WORLD, "PE"},
@@ -438,9 +439,9 @@ static struct country_code_to_enum_rd allCountries[] = {
{CTRY_PORTUGAL, ETSI1_WORLD, "PT"},
{CTRY_PUERTO_RICO, FCC1_FCCA, "PR"},
{CTRY_QATAR, APL1_WORLD, "QA"},
- {CTRY_ROMANIA, NULL1_WORLD, "RO"},
- {CTRY_RUSSIA, NULL1_WORLD, "RU"},
- {CTRY_SAUDI_ARABIA, NULL1_WORLD, "SA"},
+ {CTRY_ROMANIA, ETSI1_WORLD, "RO"},
+ {CTRY_RUSSIA, FCC3_WORLD, "RU"},
+ {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA"},
{CTRY_SERBIA_MONTENEGRO, ETSI1_WORLD, "CS"},
{CTRY_SINGAPORE, APL6_WORLD, "SG"},
{CTRY_SLOVAKIA, ETSI1_WORLD, "SK"},
@@ -457,7 +458,7 @@ static struct country_code_to_enum_rd allCountries[] = {
{CTRY_TUNISIA, ETSI3_WORLD, "TN"},
{CTRY_TURKEY, ETSI3_WORLD, "TR"},
{CTRY_UKRAINE, NULL1_WORLD, "UA"},
- {CTRY_UAE, NULL1_WORLD, "AE"},
+ {CTRY_UAE, ETSI1_WORLD, "AE"},
{CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB"},
{CTRY_UNITED_STATES, FCC3_FCCA, "US"},
/* This "PS" is for US public safety actually... to support this we
@@ -466,8 +467,8 @@ static struct country_code_to_enum_rd allCountries[] = {
{CTRY_UNITED_STATES_FCC49, FCC4_FCCA, "PS"},
{CTRY_URUGUAY, FCC3_WORLD, "UY"},
{CTRY_UZBEKISTAN, FCC3_FCCA, "UZ"},
- {CTRY_VENEZUELA, APL2_ETSIC, "VE"},
- {CTRY_VIET_NAM, NULL1_WORLD, "VN"},
+ {CTRY_VENEZUELA, FCC1_WORLD, "VE"},
+ {CTRY_VIET_NAM, ETSI3_WORLD, "VN"},
{CTRY_YEMEN, NULL1_WORLD, "YE"},
{CTRY_ZIMBABWE, NULL1_WORLD, "ZW"},
};
--
1.6.3.3



2010-06-17 09:48:13

by Vivek Natarajan

[permalink] [raw]
Subject: [PATCH 2/2] wireless-regdb: Enable 40MHz operation for some countries.

Enable 40MHz operation for Argentina, Brazil, Colombia, Algeria,
India, Malaysia, Peru and South Africa.

Signed-off-by: Vivek Natarajan <[email protected]>
---
db.txt | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/db.txt b/db.txt
index e405d78..74ae9e3 100644
--- a/db.txt
+++ b/db.txt
@@ -33,7 +33,7 @@ country AN:
(5490 - 5710 @ 40), (N/A, 27), DFS

country AR:
- (2402 - 2482 @ 20), (N/A, 20)
+ (2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 40), (3, 17)
(5250 - 5330 @ 40), (3, 20), DFS
(5490 - 5710 @ 40), (3, 20), DFS
@@ -111,11 +111,11 @@ country BO:
(5735 - 5835 @ 40), (N/A, 30)

country BR:
- (2402 - 2482 @ 20), (N/A, 20)
- (5170 - 5250 @ 20), (3, 17)
- (5250 - 5330 @ 20), (3, 20), DFS
- (5490 - 5710 @ 20), (3, 20), DFS
- (5735 - 5835 @ 20), (3, 30)
+ (2402 - 2482 @ 40), (N/A, 20)
+ (5170 - 5250 @ 40), (3, 17)
+ (5250 - 5330 @ 40), (3, 20), DFS
+ (5490 - 5710 @ 40), (3, 20), DFS
+ (5735 - 5835 @ 40), (3, 30)

country BY:
(2402 - 2482 @ 40), (N/A, 20)
@@ -152,9 +152,9 @@ country CN:

country CO:
(2402 - 2472 @ 40), (3, 27)
- (5170 - 5250 @ 20), (3, 17)
- (5250 - 5330 @ 20), (3, 23), DFS
- (5735 - 5835 @ 20), (3, 30)
+ (5170 - 5250 @ 40), (3, 17)
+ (5250 - 5330 @ 40), (3, 23), DFS
+ (5735 - 5835 @ 40), (3, 30)

country CR:
(2402 - 2482 @ 40), (N/A, 20)
@@ -207,7 +207,7 @@ country DO:
(5735 - 5835 @ 40), (3, 30)

country DZ:
- (2402 - 2482 @ 20), (N/A, 20)
+ (2402 - 2482 @ 40), (N/A, 20)

country EC:
(2402 - 2482 @ 40), (N/A, 20)
@@ -332,9 +332,9 @@ country IL:

country IN:
(2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (N/A, 20)
- (5250 - 5330 @ 20), (N/A, 20), DFS
- (5735 - 5835 @ 20), (N/A, 20)
+ (5170 - 5250 @ 40), (N/A, 20)
+ (5250 - 5330 @ 40), (N/A, 20), DFS
+ (5735 - 5835 @ 40), (N/A, 20)

country IS:
(2402 - 2482 @ 40), (N/A, 20)
@@ -471,9 +471,9 @@ country MT:
(5490 - 5710 @ 40), (N/A, 27), DFS

country MY:
- (2402 - 2482 @ 20), (N/A, 20)
- (5250 - 5330 @ 20), (N/A, 30), DFS
- (5735 - 5835 @ 20), (N/A, 30)
+ (2402 - 2482 @ 40), (N/A, 20)
+ (5250 - 5330 @ 40), (N/A, 30), DFS
+ (5735 - 5835 @ 40), (N/A, 30)

country MX:
(2402 - 2472 @ 40), (3, 27)
@@ -518,7 +518,7 @@ country PA:

country PE:
(2402 - 2482 @ 40), (N/A, 20)
- (5735 - 5835 @ 20), (N/A, 30)
+ (5735 - 5835 @ 40), (N/A, 30)

country PG:
(2402 - 2482 @ 40), (N/A, 20)
@@ -673,10 +673,10 @@ country YE:

country ZA:
(2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 20), (3, 17)
- (5250 - 5330 @ 20), (3, 20), DFS
- (5490 - 5710 @ 20), (3, 20), DFS
- (5735 - 5835 @ 20), (3, 30)
+ (5170 - 5250 @ 40), (3, 17)
+ (5250 - 5330 @ 40), (3, 20), DFS
+ (5490 - 5710 @ 40), (3, 20), DFS
+ (5735 - 5835 @ 40), (3, 30)

country ZW:
(2402 - 2482 @ 40), (N/A, 20)
--
1.6.3.3


2010-06-17 09:48:07

by Vivek Natarajan

[permalink] [raw]
Subject: [PATCH 1/2] wireless-regdb: Update the regulatory domain for a few countries.

Add Bangladesh(BD) with NULL1_WORLD.
Add Kenya(KE) with APL1_WORLD.
Change Honduras(HN) to FCC3_WORLD.
Change Lebanon(LB) to APL1_WORLD,
Change Macedonia(MK) to ETSI1_WORLD.
Change Pakistan(PK) to APL1_WORLD.
Change Romania(RO) to ETSI1_WORLD.
Change Russia(RU) to FCC3_WORLD.
Change Saudi Arabia(SA) to FCC2_WORLD.
Change UAE(AE) to ETSI1_WORLD.
Change Venezuela(VE) to FCC1_WORLD.
Change Vietnam(VN) to ETSI3_WORLD.

Signed-off-by: Vivek Natarajan <[email protected]>
---
db.txt | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/db.txt b/db.txt
index e63a43e..e405d78 100644
--- a/db.txt
+++ b/db.txt
@@ -14,6 +14,9 @@ country 00:

country AE:
(2402 - 2482 @ 40), (N/A, 20)
+ (5170 - 5250 @ 40), (N/A, 20)
+ (5250 - 5330 @ 40), (N/A, 20), DFS
+ (5490 - 5710 @ 40), (N/A, 27), DFS

country AL:
(2402 - 2482 @ 20), (N/A, 20)
@@ -71,6 +74,9 @@ country BB:
(5250 - 5330 @ 40), (3, 23), DFS
(5735 - 5835 @ 40), (3, 30)

+country BD:
+ (2402 - 2482 @ 40), (N/A, 20)
+
country BE:
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 40), (N/A, 20)
@@ -282,6 +288,10 @@ country GU:

country HN:
(2402 - 2482 @ 40), (N/A, 20)
+ (5170 - 5250 @ 40), (3, 17)
+ (5250 - 5330 @ 40), (3, 20), DFS
+ (5490 - 5710 @ 40), (3, 20), DFS
+ (5735 - 5835 @ 40), (3, 30)

country HK:
(2402 - 2482 @ 40), (N/A, 20)
@@ -367,6 +377,10 @@ country JO:
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 40), (N/A, 18)

+country KE:
+ (2402 - 2482 @ 40), (N/A, 20)
+ (5735 - 5835 @ 40), (N/A, 30)
+
country KH:
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 40), (N/A, 20)
@@ -397,6 +411,7 @@ country KZ:

country LB:
(2402 - 2482 @ 40), (N/A, 20)
+ (5735 - 5835 @ 40), (N/A, 30)

country LI:
(2402 - 2482 @ 40), (N/A, 20)
@@ -445,6 +460,9 @@ country MO:

country MK:
(2402 - 2482 @ 40), (N/A, 20)
+ (5170 - 5250 @ 40), (N/A, 20)
+ (5250 - 5330 @ 40), (N/A, 20), DFS
+ (5490 - 5710 @ 40), (N/A, 27), DFS

country MT:
(2402 - 2482 @ 40), (N/A, 20)
@@ -514,6 +532,7 @@ country PH:

country PK:
(2402 - 2482 @ 40), (N/A, 20)
+ (5735 - 5835 @ 40), (N/A, 30)

country PL:
(2402 - 2482 @ 40), (N/A, 20)
@@ -539,12 +558,19 @@ country QA:

country RO:
(2402 - 2482 @ 40), (N/A, 20)
+ (5170 - 5250 @ 40), (N/A, 20)
+ (5250 - 5330 @ 40), (N/A, 20), DFS
+ (5490 - 5710 @ 40), (N/A, 27), DFS

country RU:
(2402 - 2482 @ 40), (N/A, 20)
+ (5735 - 5835 @ 20), (N/A, 30)

country SA:
(2402 - 2482 @ 40), (N/A, 20)
+ (5170 - 5250 @ 20), (3, 23)
+ (5250 - 5330 @ 20), (3, 23), DFS
+ (5735 - 5835 @ 20), (3, 30)

country SE:
(2402 - 2482 @ 40), (N/A, 20)
@@ -634,11 +660,13 @@ country UZ:
(5735 - 5835 @ 40), (3, 30)

country VE:
- (2402 - 2482 @ 40), (N/A, 30)
- (5735 - 5815 @ 20), (N/A, 23)
+ (2402 - 2482 @ 40), (N/A, 20)
+ (5735 - 5815 @ 40), (N/A, 23)

country VN:
(2402 - 2482 @ 40), (N/A, 20)
+ (5170 - 5250 @ 40), (N/A, 20)
+ (5250 - 5330 @ 40), (N/A, 20), DFS

country YE:
(2402 - 2482 @ 40), (N/A, 20)
--
1.6.3.3


2010-06-18 19:00:11

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH 2/2] wireless-regdb: Enable 40MHz operation for some countries.

On Thu, Jun 17, 2010 at 03:17:54PM +0530, Vivek Natarajan wrote:
> Enable 40MHz operation for Argentina, Brazil, Colombia, Algeria,
> India, Malaysia, Peru and South Africa.
>
> Signed-off-by: Vivek Natarajan <[email protected]>

These too...

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2010-06-18 19:00:11

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH 1/2] wireless-regdb: Update the regulatory domain for a few countries.

On Thu, Jun 17, 2010 at 03:17:53PM +0530, Vivek Natarajan wrote:
> Add Bangladesh(BD) with NULL1_WORLD.
> Add Kenya(KE) with APL1_WORLD.
> Change Honduras(HN) to FCC3_WORLD.
> Change Lebanon(LB) to APL1_WORLD,
> Change Macedonia(MK) to ETSI1_WORLD.
> Change Pakistan(PK) to APL1_WORLD.
> Change Romania(RO) to ETSI1_WORLD.
> Change Russia(RU) to FCC3_WORLD.
> Change Saudi Arabia(SA) to FCC2_WORLD.
> Change UAE(AE) to ETSI1_WORLD.
> Change Venezuela(VE) to FCC1_WORLD.
> Change Vietnam(VN) to ETSI3_WORLD.
>
> Signed-off-by: Vivek Natarajan <[email protected]>

It would be nice to have some reference for these changes...

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.