浏览代码

qcacmn: Cleanup host regdb

Below code changes are made
1. Correct 5 GHz reg rules for APL 26/27 RDs.
   i. APL26 changes
      a. CHAN_5170_5330_3 is split into CHAN_5170_5250_8 and
         CHAN_5250_5330_12 To mark missing radar frequency range.
      b. CHAN_5490_5730_3 changed to CHAN_5490_5730_5 to mark the
         frequency range as radar indication range.
   ii. APL27 changes
      a. CHAN_5250_5330_10 and CHAN_5490_5730_4 are changed to
         CHAN_5250_5330_7 and CHAN_5490_5730_1 respectively to mark the
         frequency range as radar indication range.

2. Remove duplicate entry CHAN_5735_5835_8 (duplicate of CHAN_5735_5835_1)

Change-Id: Ib9d0e7455d489451da8beb71175e9a9b4ff6d3ca
CRs-Fixed: 3447101
Gangadhar Kavalastramath 2 年之前
父节点
当前提交
0af47f96fe
共有 1 个文件被更改,包括 8 次插入9 次删除
  1. 8 9
      umac/regulatory/core/src/reg_db.c

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

@@ -1148,7 +1148,6 @@ enum reg_rules_5g {
 	CHAN_5735_5835_5,
 	CHAN_5735_5835_6,
 	CHAN_5735_5835_7,
-	CHAN_5735_5835_8,
 	CHAN_5735_5835_9,
 	CHAN_5735_5835_10,
 	CHAN_5735_5875_1,
@@ -1257,7 +1256,6 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5735_5835_5] = {5735, 5835, 80, 20, REGULATORY_CHAN_NO_IR},
 	[CHAN_5735_5835_6] = {5735, 5835, 80, 24, 0},
 	[CHAN_5735_5835_7] = {5735, 5835, 80, 36, 0},
-	[CHAN_5735_5835_8] = {5735, 5835, 80, 23, 0},
 	[CHAN_5735_5835_9] = {5735, 5835, 80, 30, REGULATORY_CHAN_RADAR},
 	[CHAN_5735_5835_10] = {5735, 5835, 80, 14, REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5735_5875_1] = {5735, 5875, 20, 27, REGULATORY_CHAN_RADAR},
@@ -1410,7 +1408,7 @@ const struct regdomain regdomains_5g[] = {
 	[ETSI12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 320, 0, 4, {CHAN_5170_5250_8,
 							      CHAN_5250_5330_12,
 							      CHAN_5490_5730_5,
-							      CHAN_5735_5835_8}
+							      CHAN_5735_5835_1}
 							      },
 
 	[ETSI13] = {CTL_ETSI, DFS_ETSI_REGION, 2, 160, 0, 4, {CHAN_5170_5250_8,
@@ -1547,13 +1545,14 @@ const struct regdomain regdomains_5g[] = {
 							     CHAN_5735_5835_7}
 							    },
 
-	[APL26] = {CTL_ETSI, DFS_ETSI_REGION, 2, 320, 0, 3, {CHAN_5170_5330_3,
-							     CHAN_5490_5730_3,
-							     CHAN_5735_5835_7}
-							    },
+	[APL26] = {CTL_ETSI, DFS_ETSI_REGION, 2, 320, 0, 4, {CHAN_5170_5250_8,
+							    CHAN_5250_5330_12,
+							    CHAN_5490_5730_5,
+							    CHAN_5735_5835_7} },
+
 	[APL27] = {CTL_FCC, DFS_ETSI_REGION, 2, 320, 0, 4, {CHAN_5170_5250_13,
-							    CHAN_5250_5330_10,
-							    CHAN_5490_5730_4,
+							    CHAN_5250_5330_7,
+							    CHAN_5490_5730_1,
 							    CHAN_5735_5835_2} },
 
 	[APL28] = {CTL_ETSI, DFS_ETSI_REGION, 2, 320, 0, 4, {CHAN_5170_5250_8,