qcacmn: Correct CTL value for world reg-domains

Assign CTL_NONE to WORLD 2GHz/5GHz regdomain.

Change-Id: I346c136947083f5e00407a3d91651c6fd071aa1d
CRs-Fixed: 2048784
This commit is contained in:
Amar Singhal 2017-06-23 12:19:18 +05:30 • committed by snandini
commit 331a5a6e7c
2 changed files with 16 additions and 10 deletions

View file

@ -677,10 +677,10 @@ const struct regdomain regdomains_2g[] = {
[MKKA] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 2, {CHAN_1_13_1, CHAN_14_1} },
[MKKC] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_1} },
[ETSIC] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_2} },
[WORLD_2G_1] = {CTL_FCC, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_11_2} },
[WORLD_2G_2] = {CTL_FCC, DFS_UNINIT_REG, 0, 0, 2,
[WORLD_2G_1] = {CTL_NONE, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_11_2} },
[WORLD_2G_2] = {CTL_NONE, DFS_UNINIT_REG, 0, 0, 2,
{CHAN_1_11_2, CHAN_12_13_1} },
[WORLD_2G_3] = {CTL_FCC, DFS_UNINIT_REG, 0, 0, 3,
[WORLD_2G_3] = {CTL_NONE, DFS_UNINIT_REG, 0, 0, 3,
{CHAN_1_11_2, CHAN_12_13_1, CHAN_14_2} },
};
@ -888,10 +888,10 @@ const struct regdomain regdomains_5g[] = {
CHAN_4910_4990_1,
CHAN_5030_5090_1} },
[WORLD_5G_1] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 2, {CHAN_5170_5330_1,
[WORLD_5G_1] = {CTL_NONE, DFS_UNINIT_REG, 2, 0, 2, {CHAN_5170_5330_1,
CHAN_5735_5835_5} },
[WORLD_5G_2] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5330_1,
[WORLD_5G_2] = {CTL_NONE, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5330_1,
CHAN_5490_5730_3,
CHAN_5735_5835_5} },
};

View file

@ -134,15 +134,21 @@ struct reg_domain_pair {
/**
* enum ctl_value - CTL value
* @CTL_FCC: FCC
* @CTL_MKK: MKK
* @CTL_ETSI: ETSI
* @CTL_NONE: no CTL
* @CTL_FCC: CTL FCC
* @CTL_MKK: CTL MKK
* @CTL_ETSI: CTL ETSI
* @CTL_KOR: CTL KOR
* @CTL_CHN: CTL CHINA
* @CTL_USER_DEF: CTL USER_DEF
* @CTL_NONE: CTL NONE
*/
enum ctl_value {
CTL_FCC = 0x10,
CTL_MKK = 0x40,
CTL_ETSI = 0x30,
CTL_MKK = 0x40,
CTL_KOR = 0x50,
CTL_CHN = 0x60,
CTL_USER_DEF = 0x70,
CTL_NONE = 0xff
};