AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ath: Add a missing world regulatory domain 0x6C

Browse Source 
Some customers use 0x6C world regulatory domain and this patch
adds the support.

Cc: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Senthil Balasubramanian 2011-04-14 16:41:30 +05:30 committed by John W. Linville
parent 9f219bd248
commit 34a0a2025c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/ath/regd.c
View File

@ -97,8 +97,8 @@ static const struct ieee80211_regdomain ath_world_regdom_66_69 = {
} }
}; };
/* Can be used by 0x67, 0x6A and 0x68 */ /* Can be used by 0x67, 0x68, 0x6A and 0x6C */
static const struct ieee80211_regdomain ath_world_regdom_67_68_6A = { static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {
.n_reg_rules = 4, .n_reg_rules = 4,
.alpha2 = "99", .alpha2 = "99",
.reg_rules = { .reg_rules = {
@ -151,7 +151,8 @@ ieee80211_regdomain *ath_world_regdomain(struct ath_regulatory *reg)
case 0x67: case 0x67:
case 0x68: case 0x68:
case 0x6A: case 0x6A:
return &ath_world_regdom_67_68_6A; case 0x6C:
return &ath_world_regdom_67_68_6A_6C;
default: default:
WARN_ON(1); WARN_ON(1);
return ath_default_world_regdomain(); return ath_default_world_regdomain();

2
drivers/net/wireless/ath/regd_common.h
View File

@ -86,6 +86,7 @@ enum EnumRd {
WOR9_WORLD = 0x69, WOR9_WORLD = 0x69,
WORA_WORLD = 0x6A, WORA_WORLD = 0x6A,
WORB_WORLD = 0x6B, WORB_WORLD = 0x6B,
WORC_WORLD = 0x6C,
MKK3_MKKB = 0x80, MKK3_MKKB = 0x80,
MKK3_MKKA2 = 0x81, MKK3_MKKA2 = 0x81,
@ -282,6 +283,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = {
{WOR9_WORLD, NO_CTL, NO_CTL}, {WOR9_WORLD, NO_CTL, NO_CTL},
{WORA_WORLD, NO_CTL, NO_CTL}, {WORA_WORLD, NO_CTL, NO_CTL},
{WORB_WORLD, NO_CTL, NO_CTL}, {WORB_WORLD, NO_CTL, NO_CTL},
{WORC_WORLD, NO_CTL, NO_CTL},
}; };
static struct country_code_to_enum_rd allCountries[] = { static struct country_code_to_enum_rd allCountries[] = {