From 0bd8b1bf755ee9e982e143246b4d9e14d4adaa5b Mon Sep 17 00:00:00 2001 From: Gururaj Pandurangi Date: Tue, 12 May 2020 11:01:34 -0700 Subject: [PATCH] qcacmn: Update reg dmn to support new 5.9 ghz chan Update reg domain rules to support three new channels in 5.9 GHz for US. New channels are 169, 173 and 177 with freq 5845, 5865 and 5885 MHz respectively. These new channels will be controlled by an ini fcc_5dot9_ghz_chan_in_master_mode and a service bit WMI_SERVICE_5_DOT_9GHZ_SUPPORT. If the service bit is not set we disable the new channels, and if service bit is set but not the ini, we make the channels passive. If both are set, they will be enabled. Change-Id: I575b02ad387cbda00b015f7075d80c907463bdef CRs-Fixed: 2683702 --- umac/regulatory/core/src/reg_db.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index 398b08a861c5..71bae306b8b0 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -1229,6 +1229,7 @@ enum reg_rules_5g { CHAN_5735_5815_3, CHAN_5735_5815_4, CHAN_5735_5775_1, + CHAN_5735_5895_1, CHAN_5835_5855_1, CHAN_5855_5875_1, CHAN_5850_5925_1, @@ -1326,6 +1327,7 @@ const struct regulatory_rule reg_rules_5g[] = { [CHAN_5735_5815_3] = {5735, 5815, 80, 23, REGULATORY_CHAN_INDOOR_ONLY}, [CHAN_5735_5815_4] = {5735, 5815, 20, 20, 0}, [CHAN_5735_5775_1] = {5735, 5775, 40, 23, 0}, + [CHAN_5735_5895_1] = {5735, 5895, 160, 30, 0}, [CHAN_5835_5855_1] = {5835, 5855, 20, 30, 0}, [CHAN_5855_5875_1] = {5855, 5875, 20, 30, 0}, [CHAN_5850_5925_1] = {5850, 5925, 20, 24, 0}, @@ -1356,7 +1358,7 @@ const struct regdomain regdomains_5g[] = { [FCC3] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 4, {CHAN_5170_5250_5, CHAN_5250_5330_7, CHAN_5490_5730_1, - CHAN_5735_5835_2} }, + CHAN_5735_5895_1} }, [FCC4] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 4, {CHAN_4940_4990_1, CHAN_5170_5250_1, @@ -1375,7 +1377,7 @@ const struct regdomain regdomains_5g[] = { [FCC8] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 6, 4, {CHAN_5170_5250_4, CHAN_5250_5330_7, CHAN_5490_5730_1, - CHAN_5735_5835_2} }, + CHAN_5735_5895_1} }, [FCC10] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 0, 5, {CHAN_5170_5250_4, CHAN_5250_5330_7, @@ -1404,7 +1406,7 @@ const struct regdomain regdomains_5g[] = { [FCC15] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 0, 8, {CHAN_5170_5250_5, CHAN_5250_5330_7, CHAN_5490_5730_1, - CHAN_5735_5835_2, + CHAN_5735_5895_1, CHAN_5935_6435_1, CHAN_6435_6535_1, CHAN_6535_6875_1, @@ -1413,7 +1415,7 @@ const struct regdomain regdomains_5g[] = { [FCC16] = {CTL_FCC, DFS_FCC_REGION, 2, 160, 0, 8, {CHAN_5170_5250_4, CHAN_5250_5330_7, CHAN_5490_5730_1, - CHAN_5735_5835_2, + CHAN_5735_5895_1, CHAN_5935_6435_2, CHAN_6435_6535_2, CHAN_6535_6875_2,