Browse Source

qcacmn: Update regdb with regulatory database version 28

Update regdb with QCA regulatory database version 28 with
following changes:

1) Change ETSI10, ETSI11, ETSI12 lower 5G channels to "Indoor-Only"
2) Add 40MHz 5835 channel to India APL19
3) Remove HT/VHT20 Ch 5825 and Add HT/VHT20 Ch. 5720 (straddle) channel
   to ETSI15 for Saudi Arabia

Change-Id: Id3075d22ec4403685ce3eaf00f0070b6ecab1fdf
CRs-Fixed: 2396234
Hariharan Basuthkar 6 years ago
parent
commit
f0fc34b2b1
2 changed files with 16 additions and 10 deletions
  1. 13 8
      umac/regulatory/core/src/reg_db.c
  2. 3 2
      umac/regulatory/core/src/reg_services_common.c

+ 13 - 8
umac/regulatory/core/src/reg_db.c

@@ -1034,6 +1034,7 @@ enum reg_rules_5g {
 	CHAN_5250_5330_11,
 	CHAN_5250_5330_12,
 	CHAN_5250_5330_13,
+	CHAN_5250_5330_14,
 	CHAN_5490_5730_1,
 	CHAN_5490_5730_2,
 	CHAN_5490_5730_3,
@@ -1074,6 +1075,7 @@ enum reg_rules_5g {
 	CHAN_5735_5875_4,
 	CHAN_5735_5875_5,
 	CHAN_5735_5815_1,
+	CHAN_5735_5815_2,
 	CHAN_5735_5775_1,
 	CHAN_5835_5855_1,
 	CHAN_5855_5875_1,
@@ -1111,6 +1113,8 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5250_5330_12] = {5250, 5330, 80, 23, REGULATORY_CHAN_RADAR |
 						   REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5250_5330_13] = {5250, 5330, 40, 30, REGULATORY_CHAN_RADAR},
+	[CHAN_5250_5330_14] = {5250, 5330, 80, 20, REGULATORY_CHAN_RADAR |
+						   REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5490_5730_1] = {5490, 5730, 160, 24, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5730_2] = {5490, 5730, 160, 20, REGULATORY_CHAN_NO_IR},
 	[CHAN_5490_5730_3] = {5490, 5730, 160, 30, 0},
@@ -1151,6 +1155,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5735_5875_4] = {5735, 5875, 80, 14, 0},
 	[CHAN_5735_5875_5] = {5735, 5875, 80, 20, REGULATORY_CHAN_RADAR},
 	[CHAN_5735_5815_1] = {5735, 5815, 80, 30, 0},
+	[CHAN_5735_5815_2] = {5735, 5815, 80, 30, REGULATORY_CHAN_RADAR},
 	[CHAN_5735_5775_1] = {5735, 5775, 40, 23, 0},
 	[CHAN_5835_5855_1] = {5835, 5855, 20, 30, 0},
 	[CHAN_5855_5875_1] = {5855, 5875, 20, 30, 0},
@@ -1231,18 +1236,18 @@ const struct regdomain regdomains_5g[] = {
 							 CHAN_5490_5710_5,
 							 CHAN_5735_5835_6} },
 
-	[ETSI10] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_3,
-							  CHAN_5250_5330_2,
+	[ETSI10] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_7,
+							  CHAN_5250_5330_14,
 							  CHAN_5490_5710_3,
 							  CHAN_5850_5925_2} },
 
-	[ETSI11] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_3,
-							  CHAN_5250_5330_2,
+	[ETSI11] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_7,
+							  CHAN_5250_5330_14,
 							  CHAN_5490_5710_3,
 							  CHAN_5735_5875_1} },
 
-	[ETSI12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_3,
-							 CHAN_5250_5330_2,
+	[ETSI12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_7,
+							 CHAN_5250_5330_14,
 							 CHAN_5490_5730_6,
 							 CHAN_5735_5835_8} },
 
@@ -1258,8 +1263,8 @@ const struct regdomain regdomains_5g[] = {
 
 	[ETSI15] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_2,
 							 CHAN_5250_5330_1,
-							 CHAN_5490_5710_1,
-							 CHAN_5735_5835_9} },
+							 CHAN_5490_5730_5,
+							 CHAN_5735_5815_2} },
 
 	[APL1] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 1, {CHAN_5735_5835_2} },
 

+ 3 - 2
umac/regulatory/core/src/reg_services_common.c

@@ -49,7 +49,8 @@ static const struct bonded_channel bonded_chan_40mhz_list[] = {
 	{132, 136},
 	{140, 144},
 	{149, 153},
-	{157, 161}
+	{157, 161},
+	{165, 169}
 };
 
 static const struct bonded_channel bonded_chan_80mhz_list[] = {
@@ -121,7 +122,7 @@ static const struct chan_map channel_map_old[NUM_CHANNELS] = {
 	[CHAN_ENUM_161] = {5805, 161, 2, 160},
 	[CHAN_ENUM_165] = {5825, 165, 2, 160},
 #ifndef WLAN_FEATURE_DSRC
-	[CHAN_ENUM_169] = {5845, 169, 2, 20},
+	[CHAN_ENUM_169] = {5845, 169, 2, 40},
 	[CHAN_ENUM_173] = {5865, 173, 2, 20},
 #else
 	[CHAN_ENUM_170] = {5852, 170, 2, 20},