qcacmn: 11ax draft 6.1 6G channelization update

In 11ax draft 6.1, the 6G starting frequency has been shifted by 10 MHz
to the right from 5940 to 5950. Make the following changes in various
variables and structures in the regulatory component:

1. Add a macro SIX_GHZ_NON_ORPHAN_START_FREQ.
2. Add an orphan channel frequency - 5935 MHz to the chan enum.
3. Shift every enum in channel_enum by 10 MHz to the right.
4. Shift MIN_CHANNEL_6GHZ and MAX_CHANNEL_6GHZ by 10 MHz on the right.
5. Shift every center frequeny by 10 MHz on the right in
   bonded_chan_40mhz_list_freq, bonded_chan_80mhz_list_freq,
   bonded_chan_160mhz_list_freq.
6. Shift every center frequeny by 10 MHz on the right in channel_map_us,
   channel_map_eu, channel_map_japan, channel_map_global and
   channel_map_china channel maps.
7. Change 6G starting frequency from 5940 to 5950 for operating class
   131 to 135 in the global_op_class table.
   table.
8. Add operating class 136 in the global_op_class table.

Change-Id: I3c82e2eb98cdaf0ff8754bd990529a1833276304
CRs-Fixed: 2704977

umac/regulatory/core/src/reg_opclass.c

@@ -86,7 +86,7 @@ static const struct reg_dmn_op_class_map_t global_op_class[] = {
 	  132, 136, 140, 144, 149, 153, 157, 161} },
 
 #ifdef CONFIG_BAND_6GHZ
-	{131, 20, BW20, BIT(BEHAV_NONE), 5940,
+	{131, 20, BW20, BIT(BEHAV_NONE), 5950,
 	 {1, 5, 9, 13, 17, 21, 25, 29, 33,
 	  37, 41, 45, 49, 53, 57, 61, 65, 69,
 	  73, 77, 81, 85, 89, 93, 97,
@@ -96,7 +96,7 @@ static const struct reg_dmn_op_class_map_t global_op_class[] = {
 	  185, 189, 193, 197, 201, 205, 209,
 	  213, 217, 221, 225, 229, 233} },
 
-	{132, 40, BW40_LOW_PRIMARY, BIT(BEHAV_NONE), 5940,
+	{132, 40, BW40_LOW_PRIMARY, BIT(BEHAV_NONE), 5950,
 	 {1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49,
 	  53, 57, 61, 65, 69, 73, 77, 81, 85, 89, 93, 97,
 	  101, 105, 109, 113, 117, 121, 125, 129, 133, 137,
@@ -104,7 +104,7 @@ static const struct reg_dmn_op_class_map_t global_op_class[] = {
 	  181, 185, 189, 193, 197, 201, 205, 209, 213, 217,
 	  221, 225, 229, 233} },
 
-	{133, 80, BW80, BIT(BEHAV_NONE), 5940,
+	{133, 80, BW80, BIT(BEHAV_NONE), 5950,
 	 {1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49,
 	  53, 57, 61, 65, 69, 73, 77, 81, 85, 89, 93, 97,
 	  101, 105, 109, 113, 117, 121, 125, 129, 133, 137,
@@ -112,7 +112,7 @@ static const struct reg_dmn_op_class_map_t global_op_class[] = {
 	  177, 181, 185, 189, 193, 197, 201, 205, 209, 213,
 	  217, 221, 225, 229, 233} },
 
-	{134, 160, BW80, BIT(BEHAV_NONE), 5940,
+	{134, 160, BW80, BIT(BEHAV_NONE), 5950,
 	 {1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45,
 	  49, 53, 57, 61, 65, 69, 73, 77, 81, 85, 89,
 	  93, 97, 101, 105, 109, 113, 117, 121, 125,
@@ -120,7 +120,7 @@ static const struct reg_dmn_op_class_map_t global_op_class[] = {
 	  165, 169, 173, 177, 181, 185, 189, 193, 197,
 	  201, 205, 209, 213, 217, 221, 225, 229, 233} },
 
-	{135, 80, BW80, BIT(BEHAV_BW80_PLUS), 5940,
+	{135, 80, BW80, BIT(BEHAV_BW80_PLUS), 5950,
 	 {1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41,
 	  45, 49, 53, 57, 61, 65, 69, 73, 77, 81,
 	  85, 89, 93, 97, 101, 105, 109, 113, 117,
@@ -128,6 +128,9 @@ static const struct reg_dmn_op_class_map_t global_op_class[] = {
 	  153, 157, 161, 165, 169, 173, 177, 181,
 	  185, 189, 193, 197, 201, 205, 209, 213,
 	  217, 221, 225, 229, 233} },
+
+	{136, 20, BW20, BIT(BEHAV_NONE), 5925,
+	 {2} },
 #endif
 	{0, 0, 0, 0, 0, {0} },
 };

umac/regulatory/core/src/reg_services_common.c

@@ -86,35 +86,35 @@ static const struct bonded_channel_freq bonded_chan_40mhz_list_freq[] = {
 	{5785, 5805},
 	{5825, 5845},
 #ifdef CONFIG_BAND_6GHZ
-	{5945, 5965},
-	{5985, 6005},
-	{6025, 6045},
-	{6065, 6085},
-	{6105, 6125},
-	{6145, 6165},
-	{6185, 6205},
-	{6225, 6245},
-	{6265, 6285},
-	{6305, 6325},
-	{6345, 6365},
-	{6385, 6405},
-	{6425, 6445},
-	{6465, 6485},
-	{6505, 6525},
-	{6545, 6565},
-	{6585, 6605},
-	{6625, 6645},
-	{6665, 6685},
-	{6705, 6725},
-	{6745, 6765},
-	{6785, 6805},
-	{6825, 6845},
-	{6865, 6885},
-	{6905, 6925},
-	{6945, 6965},
-	{6985, 7005},
-	{7025, 7045},
-	{7065, 7085}
+	{5955, 5975},
+	{5995, 6015},
+	{6035, 6055},
+	{6075, 6095},
+	{6115, 6135},
+	{6155, 6175},
+	{6195, 6215},
+	{6235, 6255},
+	{6275, 6295},
+	{6315, 6335},
+	{6355, 6375},
+	{6395, 6415},
+	{6435, 6455},
+	{6475, 6495},
+	{6515, 6535},
+	{6555, 6575},
+	{6595, 6615},
+	{6635, 6655},
+	{6675, 6695},
+	{6715, 6735},
+	{6755, 6775},
+	{6795, 6815},
+	{6835, 6855},
+	{6875, 6895},
+	{6915, 6935},
+	{6955, 6975},
+	{6995, 7015},
+	{7035, 7055},
+	{7075, 7095}
 #endif /*CONFIG_BAND_6GHZ*/
 };
 
@@ -127,20 +127,20 @@ static const struct bonded_channel_freq bonded_chan_80mhz_list_freq[] = {
 	{5660, 5720},
 	{5745, 5805},
 #ifdef CONFIG_BAND_6GHZ
-	{5945, 6005},
-	{6025, 6085},
-	{6105, 6165},
-	{6185, 6245},
-	{6265, 6325},
-	{6345, 6405},
-	{6425, 6485},
-	{6505, 6565},
-	{6585, 6645},
-	{6665, 6725},
-	{6745, 6805},
-	{6825, 6885},
-	{6905, 6965},
-	{6985, 7045}
+	{5955, 6015},
+	{6035, 6095},
+	{6115, 6175},
+	{6195, 6255},
+	{6275, 6335},
+	{6355, 6415},
+	{6435, 6495},
+	{6515, 6575},
+	{6595, 6655},
+	{6675, 6735},
+	{6755, 6815},
+	{6835, 6895},
+	{6915, 6975},
+	{6995, 7055}
 #endif /*CONFIG_BAND_6GHZ*/
 };
 
@@ -149,13 +149,13 @@ static const struct bonded_channel_freq bonded_chan_160mhz_list_freq[] = {
 	{5180, 5320},
 	{5500, 5640},
 #ifdef CONFIG_BAND_6GHZ
-	{5945, 6085},
-	{6105, 6245},
-	{6265, 6405},
-	{6425, 6565},
-	{6585, 6725},
-	{6745, 6885},
-	{6905, 7045}
+	{5955, 6095},
+	{6115, 6255},
+	{6275, 6415},
+	{6435, 6575},
+	{6595, 6735},
+	{6755, 6895},
+	{6915, 7055}
 #endif /*CONFIG_BAND_6GHZ*/
 };
 #endif /*CONFIG_CHAN_FREQ_API*/
@@ -281,65 +281,66 @@ const struct chan_map channel_map_us[NUM_CHANNELS] = {
 	[CHAN_ENUM_5915] = {5915, 183, 2, 160},
 	[CHAN_ENUM_5920] = {5920, 184, 2, 160},
 #ifdef CONFIG_BAND_6GHZ
-	[CHAN_ENUM_5945] = {5945, 1, 2, 160},
-	[CHAN_ENUM_5965] = {5965, 5, 2, 160},
-	[CHAN_ENUM_5985] = {5985, 9, 2, 160},
-	[CHAN_ENUM_6005] = {6005, 13, 2, 160},
-	[CHAN_ENUM_6025] = {6025, 17, 2, 160},
-	[CHAN_ENUM_6045] = {6045, 21, 2, 160},
-	[CHAN_ENUM_6065] = {6065, 25, 2, 160},
-	[CHAN_ENUM_6085] = {6085, 29, 2, 160},
-	[CHAN_ENUM_6105] = {6105, 33, 2, 160},
-	[CHAN_ENUM_6125] = {6125, 37, 2, 160},
-	[CHAN_ENUM_6145] = {6145, 41, 2, 160},
-	[CHAN_ENUM_6165] = {6165, 45, 2, 160},
-	[CHAN_ENUM_6185] = {6185, 49, 2, 160},
-	[CHAN_ENUM_6205] = {6205, 53, 2, 160},
-	[CHAN_ENUM_6225] = {6225, 57, 2, 160},
-	[CHAN_ENUM_6245] = {6245, 61, 2, 160},
-	[CHAN_ENUM_6265] = {6265, 65, 2, 160},
-	[CHAN_ENUM_6285] = {6285, 69, 2, 160},
-	[CHAN_ENUM_6305] = {6305, 73, 2, 160},
-	[CHAN_ENUM_6325] = {6325, 77, 2, 160},
-	[CHAN_ENUM_6345] = {6345, 81, 2, 160},
-	[CHAN_ENUM_6365] = {6365, 85, 2, 160},
-	[CHAN_ENUM_6385] = {6385, 89, 2, 160},
-	[CHAN_ENUM_6405] = {6405, 93, 2, 160},
-	[CHAN_ENUM_6425] = {6425, 97, 2, 160},
-	[CHAN_ENUM_6445] = {6445, 101, 2, 160},
-	[CHAN_ENUM_6465] = {6465, 105, 2, 160},
-	[CHAN_ENUM_6485] = {6485, 109, 2, 160},
-	[CHAN_ENUM_6505] = {6505, 113, 2, 160},
-	[CHAN_ENUM_6525] = {6525, 117, 2, 160},
-	[CHAN_ENUM_6545] = {6545, 121, 2, 160},
-	[CHAN_ENUM_6565] = {6565, 125, 2, 160},
-	[CHAN_ENUM_6585] = {6585, 129, 2, 160},
-	[CHAN_ENUM_6605] = {6605, 133, 2, 160},
-	[CHAN_ENUM_6625] = {6625, 137, 2, 160},
-	[CHAN_ENUM_6645] = {6645, 141, 2, 160},
-	[CHAN_ENUM_6665] = {6665, 145, 2, 160},
-	[CHAN_ENUM_6685] = {6685, 149, 2, 160},
-	[CHAN_ENUM_6705] = {6705, 153, 2, 160},
-	[CHAN_ENUM_6725] = {6725, 157, 2, 160},
-	[CHAN_ENUM_6745] = {6745, 161, 2, 160},
-	[CHAN_ENUM_6765] = {6765, 165, 2, 160},
-	[CHAN_ENUM_6785] = {6785, 169, 2, 160},
-	[CHAN_ENUM_6805] = {6805, 173, 2, 160},
-	[CHAN_ENUM_6825] = {6825, 177, 2, 160},
-	[CHAN_ENUM_6845] = {6845, 181, 2, 160},
-	[CHAN_ENUM_6865] = {6865, 185, 2, 160},
-	[CHAN_ENUM_6885] = {6885, 189, 2, 160},
-	[CHAN_ENUM_6905] = {6905, 193, 2, 160},
-	[CHAN_ENUM_6925] = {6925, 197, 2, 160},
-	[CHAN_ENUM_6945] = {6945, 201, 2, 160},
-	[CHAN_ENUM_6965] = {6965, 205, 2, 160},
-	[CHAN_ENUM_6985] = {6985, 209, 2, 160},
-	[CHAN_ENUM_7005] = {7005, 213, 2, 160},
-	[CHAN_ENUM_7025] = {7025, 217, 2, 160},
-	[CHAN_ENUM_7045] = {7045, 221, 2, 160},
-	[CHAN_ENUM_7065] = {7065, 225, 2, 160},
-	[CHAN_ENUM_7085] = {7085, 229, 2, 160},
-	[CHAN_ENUM_7105] = {7105, 233, 2, 160}
+	[CHAN_ENUM_5935] = {5935, 2, 2, 20},
+	[CHAN_ENUM_5955] = {5955, 1, 2, 160},
+	[CHAN_ENUM_5975] = {5975, 5, 2, 160},
+	[CHAN_ENUM_5995] = {5995, 9, 2, 160},
+	[CHAN_ENUM_6015] = {6015, 13, 2, 160},
+	[CHAN_ENUM_6035] = {6035, 17, 2, 160},
+	[CHAN_ENUM_6055] = {6055, 21, 2, 160},
+	[CHAN_ENUM_6075] = {6075, 25, 2, 160},
+	[CHAN_ENUM_6095] = {6095, 29, 2, 160},
+	[CHAN_ENUM_6115] = {6115, 33, 2, 160},
+	[CHAN_ENUM_6135] = {6135, 37, 2, 160},
+	[CHAN_ENUM_6155] = {6155, 41, 2, 160},
+	[CHAN_ENUM_6175] = {6175, 45, 2, 160},
+	[CHAN_ENUM_6195] = {6195, 49, 2, 160},
+	[CHAN_ENUM_6215] = {6215, 53, 2, 160},
+	[CHAN_ENUM_6235] = {6235, 57, 2, 160},
+	[CHAN_ENUM_6255] = {6255, 61, 2, 160},
+	[CHAN_ENUM_6275] = {6275, 65, 2, 160},
+	[CHAN_ENUM_6295] = {6295, 69, 2, 160},
+	[CHAN_ENUM_6315] = {6315, 73, 2, 160},
+	[CHAN_ENUM_6335] = {6335, 77, 2, 160},
+	[CHAN_ENUM_6355] = {6355, 81, 2, 160},
+	[CHAN_ENUM_6375] = {6375, 85, 2, 160},
+	[CHAN_ENUM_6395] = {6395, 89, 2, 160},
+	[CHAN_ENUM_6415] = {6415, 93, 2, 160},
+	[CHAN_ENUM_6435] = {6435, 97, 2, 160},
+	[CHAN_ENUM_6455] = {6455, 101, 2, 160},
+	[CHAN_ENUM_6475] = {6475, 105, 2, 160},
+	[CHAN_ENUM_6495] = {6495, 109, 2, 160},
+	[CHAN_ENUM_6515] = {6515, 113, 2, 160},
+	[CHAN_ENUM_6535] = {6535, 117, 2, 160},
+	[CHAN_ENUM_6555] = {6555, 121, 2, 160},
+	[CHAN_ENUM_6575] = {6575, 125, 2, 160},
+	[CHAN_ENUM_6595] = {6595, 129, 2, 160},
+	[CHAN_ENUM_6615] = {6615, 133, 2, 160},
+	[CHAN_ENUM_6635] = {6635, 137, 2, 160},
+	[CHAN_ENUM_6655] = {6655, 141, 2, 160},
+	[CHAN_ENUM_6675] = {6675, 145, 2, 160},
+	[CHAN_ENUM_6695] = {6695, 149, 2, 160},
+	[CHAN_ENUM_6715] = {6715, 153, 2, 160},
+	[CHAN_ENUM_6735] = {6735, 157, 2, 160},
+	[CHAN_ENUM_6755] = {6755, 161, 2, 160},
+	[CHAN_ENUM_6775] = {6775, 165, 2, 160},
+	[CHAN_ENUM_6795] = {6795, 169, 2, 160},
+	[CHAN_ENUM_6815] = {6815, 173, 2, 160},
+	[CHAN_ENUM_6835] = {6835, 177, 2, 160},
+	[CHAN_ENUM_6855] = {6855, 181, 2, 160},
+	[CHAN_ENUM_6875] = {6875, 185, 2, 160},
+	[CHAN_ENUM_6895] = {6895, 189, 2, 160},
+	[CHAN_ENUM_6915] = {6915, 193, 2, 160},
+	[CHAN_ENUM_6935] = {6935, 197, 2, 160},
+	[CHAN_ENUM_6955] = {6955, 201, 2, 160},
+	[CHAN_ENUM_6975] = {6975, 205, 2, 160},
+	[CHAN_ENUM_6995] = {6995, 209, 2, 160},
+	[CHAN_ENUM_7015] = {7015, 213, 2, 160},
+	[CHAN_ENUM_7035] = {7035, 217, 2, 160},
+	[CHAN_ENUM_7055] = {7055, 221, 2, 160},
+	[CHAN_ENUM_7075] = {7075, 225, 2, 160},
+	[CHAN_ENUM_7095] = {7095, 229, 2, 160},
+	[CHAN_ENUM_7115] = {7115, 233, 2, 160}
 #endif /* CONFIG_BAND_6GHZ */
 };
 
@@ -444,65 +445,66 @@ const struct chan_map channel_map_eu[NUM_CHANNELS] = {
 	[CHAN_ENUM_5915] = {5915, 183, 2, 160},
 	[CHAN_ENUM_5920] = {5920, 184, 2, 160},
 #ifdef CONFIG_BAND_6GHZ
-	[CHAN_ENUM_5945] = {5945, 1, 2, 160},
-	[CHAN_ENUM_5965] = {5965, 5, 2, 160},
-	[CHAN_ENUM_5985] = {5985, 9, 2, 160},
-	[CHAN_ENUM_6005] = {6005, 13, 2, 160},
-	[CHAN_ENUM_6025] = {6025, 17, 2, 160},
-	[CHAN_ENUM_6045] = {6045, 21, 2, 160},
-	[CHAN_ENUM_6065] = {6065, 25, 2, 160},
-	[CHAN_ENUM_6085] = {6085, 29, 2, 160},
-	[CHAN_ENUM_6105] = {6105, 33, 2, 160},
-	[CHAN_ENUM_6125] = {6125, 37, 2, 160},
-	[CHAN_ENUM_6145] = {6145, 41, 2, 160},
-	[CHAN_ENUM_6165] = {6165, 45, 2, 160},
-	[CHAN_ENUM_6185] = {6185, 49, 2, 160},
-	[CHAN_ENUM_6205] = {6205, 53, 2, 160},
-	[CHAN_ENUM_6225] = {6225, 57, 2, 160},
-	[CHAN_ENUM_6245] = {6245, 61, 2, 160},
-	[CHAN_ENUM_6265] = {6265, 65, 2, 160},
-	[CHAN_ENUM_6285] = {6285, 69, 2, 160},
-	[CHAN_ENUM_6305] = {6305, 73, 2, 160},
-	[CHAN_ENUM_6325] = {6325, 77, 2, 160},
-	[CHAN_ENUM_6345] = {6345, 81, 2, 160},
-	[CHAN_ENUM_6365] = {6365, 85, 2, 160},
-	[CHAN_ENUM_6385] = {6385, 89, 2, 160},
-	[CHAN_ENUM_6405] = {6405, 93, 2, 160},
-	[CHAN_ENUM_6425] = {6425, 97, 2, 160},
-	[CHAN_ENUM_6445] = {6445, 101, 2, 160},
-	[CHAN_ENUM_6465] = {6465, 105, 2, 160},
-	[CHAN_ENUM_6485] = {6485, 109, 2, 160},
-	[CHAN_ENUM_6505] = {6505, 113, 2, 160},
-	[CHAN_ENUM_6525] = {6525, 117, 2, 160},
-	[CHAN_ENUM_6545] = {6545, 121, 2, 160},
-	[CHAN_ENUM_6565] = {6565, 125, 2, 160},
-	[CHAN_ENUM_6585] = {6585, 129, 2, 160},
-	[CHAN_ENUM_6605] = {6605, 133, 2, 160},
-	[CHAN_ENUM_6625] = {6625, 137, 2, 160},
-	[CHAN_ENUM_6645] = {6645, 141, 2, 160},
-	[CHAN_ENUM_6665] = {6665, 145, 2, 160},
-	[CHAN_ENUM_6685] = {6685, 149, 2, 160},
-	[CHAN_ENUM_6705] = {6705, 153, 2, 160},
-	[CHAN_ENUM_6725] = {6725, 157, 2, 160},
-	[CHAN_ENUM_6745] = {6745, 161, 2, 160},
-	[CHAN_ENUM_6765] = {6765, 165, 2, 160},
-	[CHAN_ENUM_6785] = {6785, 169, 2, 160},
-	[CHAN_ENUM_6805] = {6805, 173, 2, 160},
-	[CHAN_ENUM_6825] = {6825, 177, 2, 160},
-	[CHAN_ENUM_6845] = {6845, 181, 2, 160},
-	[CHAN_ENUM_6865] = {6865, 185, 2, 160},
-	[CHAN_ENUM_6885] = {6885, 189, 2, 160},
-	[CHAN_ENUM_6905] = {6905, 193, 2, 160},
-	[CHAN_ENUM_6925] = {6925, 197, 2, 160},
-	[CHAN_ENUM_6945] = {6945, 201, 2, 160},
-	[CHAN_ENUM_6965] = {6965, 205, 2, 160},
-	[CHAN_ENUM_6985] = {6985, 209, 2, 160},
-	[CHAN_ENUM_7005] = {7005, 213, 2, 160},
-	[CHAN_ENUM_7025] = {7025, 217, 2, 160},
-	[CHAN_ENUM_7045] = {7045, 221, 2, 160},
-	[CHAN_ENUM_7065] = {7065, 225, 2, 160},
-	[CHAN_ENUM_7085] = {7085, 229, 2, 160},
-	[CHAN_ENUM_7105] = {7105, 233, 2, 160}
+	[CHAN_ENUM_5935] = {5935, 2, 2, 20},
+	[CHAN_ENUM_5955] = {5955, 1, 2, 160},
+	[CHAN_ENUM_5975] = {5975, 5, 2, 160},
+	[CHAN_ENUM_5995] = {5995, 9, 2, 160},
+	[CHAN_ENUM_6015] = {6015, 13, 2, 160},
+	[CHAN_ENUM_6035] = {6035, 17, 2, 160},
+	[CHAN_ENUM_6055] = {6055, 21, 2, 160},
+	[CHAN_ENUM_6075] = {6075, 25, 2, 160},
+	[CHAN_ENUM_6095] = {6095, 29, 2, 160},
+	[CHAN_ENUM_6115] = {6115, 33, 2, 160},
+	[CHAN_ENUM_6135] = {6135, 37, 2, 160},
+	[CHAN_ENUM_6155] = {6155, 41, 2, 160},
+	[CHAN_ENUM_6175] = {6175, 45, 2, 160},
+	[CHAN_ENUM_6195] = {6195, 49, 2, 160},
+	[CHAN_ENUM_6215] = {6215, 53, 2, 160},
+	[CHAN_ENUM_6235] = {6235, 57, 2, 160},
+	[CHAN_ENUM_6255] = {6255, 61, 2, 160},
+	[CHAN_ENUM_6275] = {6275, 65, 2, 160},
+	[CHAN_ENUM_6295] = {6295, 69, 2, 160},
+	[CHAN_ENUM_6315] = {6315, 73, 2, 160},
+	[CHAN_ENUM_6335] = {6335, 77, 2, 160},
+	[CHAN_ENUM_6355] = {6355, 81, 2, 160},
+	[CHAN_ENUM_6375] = {6375, 85, 2, 160},
+	[CHAN_ENUM_6395] = {6395, 89, 2, 160},
+	[CHAN_ENUM_6415] = {6415, 93, 2, 160},
+	[CHAN_ENUM_6435] = {6435, 97, 2, 160},
+	[CHAN_ENUM_6455] = {6455, 101, 2, 160},
+	[CHAN_ENUM_6475] = {6475, 105, 2, 160},
+	[CHAN_ENUM_6495] = {6495, 109, 2, 160},
+	[CHAN_ENUM_6515] = {6515, 113, 2, 160},
+	[CHAN_ENUM_6535] = {6535, 117, 2, 160},
+	[CHAN_ENUM_6555] = {6555, 121, 2, 160},
+	[CHAN_ENUM_6575] = {6575, 125, 2, 160},
+	[CHAN_ENUM_6595] = {6595, 129, 2, 160},
+	[CHAN_ENUM_6615] = {6615, 133, 2, 160},
+	[CHAN_ENUM_6635] = {6635, 137, 2, 160},
+	[CHAN_ENUM_6655] = {6655, 141, 2, 160},
+	[CHAN_ENUM_6675] = {6675, 145, 2, 160},
+	[CHAN_ENUM_6695] = {6695, 149, 2, 160},
+	[CHAN_ENUM_6715] = {6715, 153, 2, 160},
+	[CHAN_ENUM_6735] = {6735, 157, 2, 160},
+	[CHAN_ENUM_6755] = {6755, 161, 2, 160},
+	[CHAN_ENUM_6775] = {6775, 165, 2, 160},
+	[CHAN_ENUM_6795] = {6795, 169, 2, 160},
+	[CHAN_ENUM_6815] = {6815, 173, 2, 160},
+	[CHAN_ENUM_6835] = {6835, 177, 2, 160},
+	[CHAN_ENUM_6855] = {6855, 181, 2, 160},
+	[CHAN_ENUM_6875] = {6875, 185, 2, 160},
+	[CHAN_ENUM_6895] = {6895, 189, 2, 160},
+	[CHAN_ENUM_6915] = {6915, 193, 2, 160},
+	[CHAN_ENUM_6935] = {6935, 197, 2, 160},
+	[CHAN_ENUM_6955] = {6955, 201, 2, 160},
+	[CHAN_ENUM_6975] = {6975, 205, 2, 160},
+	[CHAN_ENUM_6995] = {6995, 209, 2, 160},
+	[CHAN_ENUM_7015] = {7015, 213, 2, 160},
+	[CHAN_ENUM_7035] = {7035, 217, 2, 160},
+	[CHAN_ENUM_7055] = {7055, 221, 2, 160},
+	[CHAN_ENUM_7075] = {7075, 225, 2, 160},
+	[CHAN_ENUM_7095] = {7095, 229, 2, 160},
+	[CHAN_ENUM_7115] = {7115, 233, 2, 160}
 #endif /* CONFIG_BAND_6GHZ */
 };
 
@@ -607,65 +609,66 @@ const struct chan_map channel_map_jp[NUM_CHANNELS] = {
 	[CHAN_ENUM_5915] = {5915, INVALID_CHANNEL_NUM, 2, 160},
 	[CHAN_ENUM_5920] = {5920, INVALID_CHANNEL_NUM, 2, 160},
 #ifdef CONFIG_BAND_6GHZ
-	[CHAN_ENUM_5945] = {5945, 1, 2, 160},
-	[CHAN_ENUM_5965] = {5965, 5, 2, 160},
-	[CHAN_ENUM_5985] = {5985, 9, 2, 160},
-	[CHAN_ENUM_6005] = {6005, 13, 2, 160},
-	[CHAN_ENUM_6025] = {6025, 17, 2, 160},
-	[CHAN_ENUM_6045] = {6045, 21, 2, 160},
-	[CHAN_ENUM_6065] = {6065, 25, 2, 160},
-	[CHAN_ENUM_6085] = {6085, 29, 2, 160},
-	[CHAN_ENUM_6105] = {6105, 33, 2, 160},
-	[CHAN_ENUM_6125] = {6125, 37, 2, 160},
-	[CHAN_ENUM_6145] = {6145, 41, 2, 160},
-	[CHAN_ENUM_6165] = {6165, 45, 2, 160},
-	[CHAN_ENUM_6185] = {6185, 49, 2, 160},
-	[CHAN_ENUM_6205] = {6205, 53, 2, 160},
-	[CHAN_ENUM_6225] = {6225, 57, 2, 160},
-	[CHAN_ENUM_6245] = {6245, 61, 2, 160},
-	[CHAN_ENUM_6265] = {6265, 65, 2, 160},
-	[CHAN_ENUM_6285] = {6285, 69, 2, 160},
-	[CHAN_ENUM_6305] = {6305, 73, 2, 160},
-	[CHAN_ENUM_6325] = {6325, 77, 2, 160},
-	[CHAN_ENUM_6345] = {6345, 81, 2, 160},
-	[CHAN_ENUM_6365] = {6365, 85, 2, 160},
-	[CHAN_ENUM_6385] = {6385, 89, 2, 160},
-	[CHAN_ENUM_6405] = {6405, 93, 2, 160},
-	[CHAN_ENUM_6425] = {6425, 97, 2, 160},
-	[CHAN_ENUM_6445] = {6445, 101, 2, 160},
-	[CHAN_ENUM_6465] = {6465, 105, 2, 160},
-	[CHAN_ENUM_6485] = {6485, 109, 2, 160},
-	[CHAN_ENUM_6505] = {6505, 113, 2, 160},
-	[CHAN_ENUM_6525] = {6525, 117, 2, 160},
-	[CHAN_ENUM_6545] = {6545, 121, 2, 160},
-	[CHAN_ENUM_6565] = {6565, 125, 2, 160},
-	[CHAN_ENUM_6585] = {6585, 129, 2, 160},
-	[CHAN_ENUM_6605] = {6605, 133, 2, 160},
-	[CHAN_ENUM_6625] = {6625, 137, 2, 160},
-	[CHAN_ENUM_6645] = {6645, 141, 2, 160},
-	[CHAN_ENUM_6665] = {6665, 145, 2, 160},
-	[CHAN_ENUM_6685] = {6685, 149, 2, 160},
-	[CHAN_ENUM_6705] = {6705, 153, 2, 160},
-	[CHAN_ENUM_6725] = {6725, 157, 2, 160},
-	[CHAN_ENUM_6745] = {6745, 161, 2, 160},
-	[CHAN_ENUM_6765] = {6765, 165, 2, 160},
-	[CHAN_ENUM_6785] = {6785, 169, 2, 160},
-	[CHAN_ENUM_6805] = {6805, 173, 2, 160},
-	[CHAN_ENUM_6825] = {6825, 177, 2, 160},
-	[CHAN_ENUM_6845] = {6845, 181, 2, 160},
-	[CHAN_ENUM_6865] = {6865, 185, 2, 160},
-	[CHAN_ENUM_6885] = {6885, 189, 2, 160},
-	[CHAN_ENUM_6905] = {6905, 193, 2, 160},
-	[CHAN_ENUM_6925] = {6925, 197, 2, 160},
-	[CHAN_ENUM_6945] = {6945, 201, 2, 160},
-	[CHAN_ENUM_6965] = {6965, 205, 2, 160},
-	[CHAN_ENUM_6985] = {6985, 209, 2, 160},
-	[CHAN_ENUM_7005] = {7005, 213, 2, 160},
-	[CHAN_ENUM_7025] = {7025, 217, 2, 160},
-	[CHAN_ENUM_7045] = {7045, 221, 2, 160},
-	[CHAN_ENUM_7065] = {7065, 225, 2, 160},
-	[CHAN_ENUM_7085] = {7085, 229, 2, 160},
-	[CHAN_ENUM_7105] = {7105, 233, 2, 160}
+	[CHAN_ENUM_5935] = {5935, 2, 2, 20},
+	[CHAN_ENUM_5955] = {5955, 1, 2, 160},
+	[CHAN_ENUM_5975] = {5975, 5, 2, 160},
+	[CHAN_ENUM_5995] = {5995, 9, 2, 160},
+	[CHAN_ENUM_6015] = {6015, 13, 2, 160},
+	[CHAN_ENUM_6035] = {6035, 17, 2, 160},
+	[CHAN_ENUM_6055] = {6055, 21, 2, 160},
+	[CHAN_ENUM_6075] = {6075, 25, 2, 160},
+	[CHAN_ENUM_6095] = {6095, 29, 2, 160},
+	[CHAN_ENUM_6115] = {6115, 33, 2, 160},
+	[CHAN_ENUM_6135] = {6135, 37, 2, 160},
+	[CHAN_ENUM_6155] = {6155, 41, 2, 160},
+	[CHAN_ENUM_6175] = {6175, 45, 2, 160},
+	[CHAN_ENUM_6195] = {6195, 49, 2, 160},
+	[CHAN_ENUM_6215] = {6215, 53, 2, 160},
+	[CHAN_ENUM_6235] = {6235, 57, 2, 160},
+	[CHAN_ENUM_6255] = {6255, 61, 2, 160},
+	[CHAN_ENUM_6275] = {6275, 65, 2, 160},
+	[CHAN_ENUM_6295] = {6295, 69, 2, 160},
+	[CHAN_ENUM_6315] = {6315, 73, 2, 160},
+	[CHAN_ENUM_6335] = {6335, 77, 2, 160},
+	[CHAN_ENUM_6355] = {6355, 81, 2, 160},
+	[CHAN_ENUM_6375] = {6375, 85, 2, 160},
+	[CHAN_ENUM_6395] = {6395, 89, 2, 160},
+	[CHAN_ENUM_6415] = {6415, 93, 2, 160},
+	[CHAN_ENUM_6435] = {6435, 97, 2, 160},
+	[CHAN_ENUM_6455] = {6455, 101, 2, 160},
+	[CHAN_ENUM_6475] = {6475, 105, 2, 160},
+	[CHAN_ENUM_6495] = {6495, 109, 2, 160},
+	[CHAN_ENUM_6515] = {6515, 113, 2, 160},
+	[CHAN_ENUM_6535] = {6535, 117, 2, 160},
+	[CHAN_ENUM_6555] = {6555, 121, 2, 160},
+	[CHAN_ENUM_6575] = {6575, 125, 2, 160},
+	[CHAN_ENUM_6595] = {6595, 129, 2, 160},
+	[CHAN_ENUM_6615] = {6615, 133, 2, 160},
+	[CHAN_ENUM_6635] = {6635, 137, 2, 160},
+	[CHAN_ENUM_6655] = {6655, 141, 2, 160},
+	[CHAN_ENUM_6675] = {6675, 145, 2, 160},
+	[CHAN_ENUM_6695] = {6695, 149, 2, 160},
+	[CHAN_ENUM_6715] = {6715, 153, 2, 160},
+	[CHAN_ENUM_6735] = {6735, 157, 2, 160},
+	[CHAN_ENUM_6755] = {6755, 161, 2, 160},
+	[CHAN_ENUM_6775] = {6775, 165, 2, 160},
+	[CHAN_ENUM_6795] = {6795, 169, 2, 160},
+	[CHAN_ENUM_6815] = {6815, 173, 2, 160},
+	[CHAN_ENUM_6835] = {6835, 177, 2, 160},
+	[CHAN_ENUM_6855] = {6855, 181, 2, 160},
+	[CHAN_ENUM_6875] = {6875, 185, 2, 160},
+	[CHAN_ENUM_6895] = {6895, 189, 2, 160},
+	[CHAN_ENUM_6915] = {6915, 193, 2, 160},
+	[CHAN_ENUM_6935] = {6935, 197, 2, 160},
+	[CHAN_ENUM_6955] = {6955, 201, 2, 160},
+	[CHAN_ENUM_6975] = {6975, 205, 2, 160},
+	[CHAN_ENUM_6995] = {6995, 209, 2, 160},
+	[CHAN_ENUM_7015] = {7015, 213, 2, 160},
+	[CHAN_ENUM_7035] = {7035, 217, 2, 160},
+	[CHAN_ENUM_7055] = {7055, 221, 2, 160},
+	[CHAN_ENUM_7075] = {7075, 225, 2, 160},
+	[CHAN_ENUM_7095] = {7095, 229, 2, 160},
+	[CHAN_ENUM_7115] = {7115, 233, 2, 160}
 #endif /* CONFIG_BAND_6GHZ */
 };
 
@@ -770,65 +773,66 @@ const struct chan_map channel_map_global[NUM_CHANNELS] = {
 	[CHAN_ENUM_5915] = {5915, INVALID_CHANNEL_NUM, 2, 160},
 	[CHAN_ENUM_5920] = {5920, INVALID_CHANNEL_NUM, 2, 160},
 #ifdef CONFIG_BAND_6GHZ
-	[CHAN_ENUM_5945] = {5945, 1, 2, 160},
-	[CHAN_ENUM_5965] = {5965, 5, 2, 160},
-	[CHAN_ENUM_5985] = {5985, 9, 2, 160},
-	[CHAN_ENUM_6005] = {6005, 13, 2, 160},
-	[CHAN_ENUM_6025] = {6025, 17, 2, 160},
-	[CHAN_ENUM_6045] = {6045, 21, 2, 160},
-	[CHAN_ENUM_6065] = {6065, 25, 2, 160},
-	[CHAN_ENUM_6085] = {6085, 29, 2, 160},
-	[CHAN_ENUM_6105] = {6105, 33, 2, 160},
-	[CHAN_ENUM_6125] = {6125, 37, 2, 160},
-	[CHAN_ENUM_6145] = {6145, 41, 2, 160},
-	[CHAN_ENUM_6165] = {6165, 45, 2, 160},
-	[CHAN_ENUM_6185] = {6185, 49, 2, 160},
-	[CHAN_ENUM_6205] = {6205, 53, 2, 160},
-	[CHAN_ENUM_6225] = {6225, 57, 2, 160},
-	[CHAN_ENUM_6245] = {6245, 61, 2, 160},
-	[CHAN_ENUM_6265] = {6265, 65, 2, 160},
-	[CHAN_ENUM_6285] = {6285, 69, 2, 160},
-	[CHAN_ENUM_6305] = {6305, 73, 2, 160},
-	[CHAN_ENUM_6325] = {6325, 77, 2, 160},
-	[CHAN_ENUM_6345] = {6345, 81, 2, 160},
-	[CHAN_ENUM_6365] = {6365, 85, 2, 160},
-	[CHAN_ENUM_6385] = {6385, 89, 2, 160},
-	[CHAN_ENUM_6405] = {6405, 93, 2, 160},
-	[CHAN_ENUM_6425] = {6425, 97, 2, 160},
-	[CHAN_ENUM_6445] = {6445, 101, 2, 160},
-	[CHAN_ENUM_6465] = {6465, 105, 2, 160},
-	[CHAN_ENUM_6485] = {6485, 109, 2, 160},
-	[CHAN_ENUM_6505] = {6505, 113, 2, 160},
-	[CHAN_ENUM_6525] = {6525, 117, 2, 160},
-	[CHAN_ENUM_6545] = {6545, 121, 2, 160},
-	[CHAN_ENUM_6565] = {6565, 125, 2, 160},
-	[CHAN_ENUM_6585] = {6585, 129, 2, 160},
-	[CHAN_ENUM_6605] = {6605, 133, 2, 160},
-	[CHAN_ENUM_6625] = {6625, 137, 2, 160},
-	[CHAN_ENUM_6645] = {6645, 141, 2, 160},
-	[CHAN_ENUM_6665] = {6665, 145, 2, 160},
-	[CHAN_ENUM_6685] = {6685, 149, 2, 160},
-	[CHAN_ENUM_6705] = {6705, 153, 2, 160},
-	[CHAN_ENUM_6725] = {6725, 157, 2, 160},
-	[CHAN_ENUM_6745] = {6745, 161, 2, 160},
-	[CHAN_ENUM_6765] = {6765, 165, 2, 160},
-	[CHAN_ENUM_6785] = {6785, 169, 2, 160},
-	[CHAN_ENUM_6805] = {6805, 173, 2, 160},
-	[CHAN_ENUM_6825] = {6825, 177, 2, 160},
-	[CHAN_ENUM_6845] = {6845, 181, 2, 160},
-	[CHAN_ENUM_6865] = {6865, 185, 2, 160},
-	[CHAN_ENUM_6885] = {6885, 189, 2, 160},
-	[CHAN_ENUM_6905] = {6905, 193, 2, 160},
-	[CHAN_ENUM_6925] = {6925, 197, 2, 160},
-	[CHAN_ENUM_6945] = {6945, 201, 2, 160},
-	[CHAN_ENUM_6965] = {6965, 205, 2, 160},
-	[CHAN_ENUM_6985] = {6985, 209, 2, 160},
-	[CHAN_ENUM_7005] = {7005, 213, 2, 160},
-	[CHAN_ENUM_7025] = {7025, 217, 2, 160},
-	[CHAN_ENUM_7045] = {7045, 221, 2, 160},
-	[CHAN_ENUM_7065] = {7065, 225, 2, 160},
-	[CHAN_ENUM_7085] = {7085, 229, 2, 160},
-	[CHAN_ENUM_7105] = {7105, 233, 2, 160}
+	[CHAN_ENUM_5935] = {5935, 2, 2, 20},
+	[CHAN_ENUM_5955] = {5955, 1, 2, 160},
+	[CHAN_ENUM_5975] = {5975, 5, 2, 160},
+	[CHAN_ENUM_5995] = {5995, 9, 2, 160},
+	[CHAN_ENUM_6015] = {6015, 13, 2, 160},
+	[CHAN_ENUM_6035] = {6035, 17, 2, 160},
+	[CHAN_ENUM_6055] = {6055, 21, 2, 160},
+	[CHAN_ENUM_6075] = {6075, 25, 2, 160},
+	[CHAN_ENUM_6095] = {6095, 29, 2, 160},
+	[CHAN_ENUM_6115] = {6115, 33, 2, 160},
+	[CHAN_ENUM_6135] = {6135, 37, 2, 160},
+	[CHAN_ENUM_6155] = {6155, 41, 2, 160},
+	[CHAN_ENUM_6175] = {6175, 45, 2, 160},
+	[CHAN_ENUM_6195] = {6195, 49, 2, 160},
+	[CHAN_ENUM_6215] = {6215, 53, 2, 160},
+	[CHAN_ENUM_6235] = {6235, 57, 2, 160},
+	[CHAN_ENUM_6255] = {6255, 61, 2, 160},
+	[CHAN_ENUM_6275] = {6275, 65, 2, 160},
+	[CHAN_ENUM_6295] = {6295, 69, 2, 160},
+	[CHAN_ENUM_6315] = {6315, 73, 2, 160},
+	[CHAN_ENUM_6335] = {6335, 77, 2, 160},
+	[CHAN_ENUM_6355] = {6355, 81, 2, 160},
+	[CHAN_ENUM_6375] = {6375, 85, 2, 160},
+	[CHAN_ENUM_6395] = {6395, 89, 2, 160},
+	[CHAN_ENUM_6415] = {6415, 93, 2, 160},
+	[CHAN_ENUM_6435] = {6435, 97, 2, 160},
+	[CHAN_ENUM_6455] = {6455, 101, 2, 160},
+	[CHAN_ENUM_6475] = {6475, 105, 2, 160},
+	[CHAN_ENUM_6495] = {6495, 109, 2, 160},
+	[CHAN_ENUM_6515] = {6515, 113, 2, 160},
+	[CHAN_ENUM_6535] = {6535, 117, 2, 160},
+	[CHAN_ENUM_6555] = {6555, 121, 2, 160},
+	[CHAN_ENUM_6575] = {6575, 125, 2, 160},
+	[CHAN_ENUM_6595] = {6595, 129, 2, 160},
+	[CHAN_ENUM_6615] = {6615, 133, 2, 160},
+	[CHAN_ENUM_6635] = {6635, 137, 2, 160},
+	[CHAN_ENUM_6655] = {6655, 141, 2, 160},
+	[CHAN_ENUM_6675] = {6675, 145, 2, 160},
+	[CHAN_ENUM_6695] = {6695, 149, 2, 160},
+	[CHAN_ENUM_6715] = {6715, 153, 2, 160},
+	[CHAN_ENUM_6735] = {6735, 157, 2, 160},
+	[CHAN_ENUM_6755] = {6755, 161, 2, 160},
+	[CHAN_ENUM_6775] = {6775, 165, 2, 160},
+	[CHAN_ENUM_6795] = {6795, 169, 2, 160},
+	[CHAN_ENUM_6815] = {6815, 173, 2, 160},
+	[CHAN_ENUM_6835] = {6835, 177, 2, 160},
+	[CHAN_ENUM_6855] = {6855, 181, 2, 160},
+	[CHAN_ENUM_6875] = {6875, 185, 2, 160},
+	[CHAN_ENUM_6895] = {6895, 189, 2, 160},
+	[CHAN_ENUM_6915] = {6915, 193, 2, 160},
+	[CHAN_ENUM_6935] = {6935, 197, 2, 160},
+	[CHAN_ENUM_6955] = {6955, 201, 2, 160},
+	[CHAN_ENUM_6975] = {6975, 205, 2, 160},
+	[CHAN_ENUM_6995] = {6995, 209, 2, 160},
+	[CHAN_ENUM_7015] = {7015, 213, 2, 160},
+	[CHAN_ENUM_7035] = {7035, 217, 2, 160},
+	[CHAN_ENUM_7055] = {7055, 221, 2, 160},
+	[CHAN_ENUM_7075] = {7075, 225, 2, 160},
+	[CHAN_ENUM_7095] = {7095, 229, 2, 160},
+	[CHAN_ENUM_7115] = {7115, 233, 2, 160}
 #endif /* CONFIG_BAND_6GHZ */
 };
 
@@ -933,65 +937,66 @@ const struct chan_map channel_map_china[NUM_CHANNELS] = {
 	[CHAN_ENUM_5915] = {5915, INVALID_CHANNEL_NUM, 2, 160},
 	[CHAN_ENUM_5920] = {5920, INVALID_CHANNEL_NUM, 2, 160},
 #ifdef CONFIG_BAND_6GHZ
-	[CHAN_ENUM_5945] = {5945, 1, 2, 160},
-	[CHAN_ENUM_5965] = {5965, 5, 2, 160},
-	[CHAN_ENUM_5985] = {5985, 9, 2, 160},
-	[CHAN_ENUM_6005] = {6005, 13, 2, 160},
-	[CHAN_ENUM_6025] = {6025, 17, 2, 160},
-	[CHAN_ENUM_6045] = {6045, 21, 2, 160},
-	[CHAN_ENUM_6065] = {6065, 25, 2, 160},
-	[CHAN_ENUM_6085] = {6085, 29, 2, 160},
-	[CHAN_ENUM_6105] = {6105, 33, 2, 160},
-	[CHAN_ENUM_6125] = {6125, 37, 2, 160},
-	[CHAN_ENUM_6145] = {6145, 41, 2, 160},
-	[CHAN_ENUM_6165] = {6165, 45, 2, 160},
-	[CHAN_ENUM_6185] = {6185, 49, 2, 160},
-	[CHAN_ENUM_6205] = {6205, 53, 2, 160},
-	[CHAN_ENUM_6225] = {6225, 57, 2, 160},
-	[CHAN_ENUM_6245] = {6245, 61, 2, 160},
-	[CHAN_ENUM_6265] = {6265, 65, 2, 160},
-	[CHAN_ENUM_6285] = {6285, 69, 2, 160},
-	[CHAN_ENUM_6305] = {6305, 73, 2, 160},
-	[CHAN_ENUM_6325] = {6325, 77, 2, 160},
-	[CHAN_ENUM_6345] = {6345, 81, 2, 160},
-	[CHAN_ENUM_6365] = {6365, 85, 2, 160},
-	[CHAN_ENUM_6385] = {6385, 89, 2, 160},
-	[CHAN_ENUM_6405] = {6405, 93, 2, 160},
-	[CHAN_ENUM_6425] = {6425, 97, 2, 160},
-	[CHAN_ENUM_6445] = {6445, 101, 2, 160},
-	[CHAN_ENUM_6465] = {6465, 105, 2, 160},
-	[CHAN_ENUM_6485] = {6485, 109, 2, 160},
-	[CHAN_ENUM_6505] = {6505, 113, 2, 160},
-	[CHAN_ENUM_6525] = {6525, 117, 2, 160},
-	[CHAN_ENUM_6545] = {6545, 121, 2, 160},
-	[CHAN_ENUM_6565] = {6565, 125, 2, 160},
-	[CHAN_ENUM_6585] = {6585, 129, 2, 160},
-	[CHAN_ENUM_6605] = {6605, 133, 2, 160},
-	[CHAN_ENUM_6625] = {6625, 137, 2, 160},
-	[CHAN_ENUM_6645] = {6645, 141, 2, 160},
-	[CHAN_ENUM_6665] = {6665, 145, 2, 160},
-	[CHAN_ENUM_6685] = {6685, 149, 2, 160},
-	[CHAN_ENUM_6705] = {6705, 153, 2, 160},
-	[CHAN_ENUM_6725] = {6725, 157, 2, 160},
-	[CHAN_ENUM_6745] = {6745, 161, 2, 160},
-	[CHAN_ENUM_6765] = {6765, 165, 2, 160},
-	[CHAN_ENUM_6785] = {6785, 169, 2, 160},
-	[CHAN_ENUM_6805] = {6805, 173, 2, 160},
-	[CHAN_ENUM_6825] = {6825, 177, 2, 160},
-	[CHAN_ENUM_6845] = {6845, 181, 2, 160},
-	[CHAN_ENUM_6865] = {6865, 185, 2, 160},
-	[CHAN_ENUM_6885] = {6885, 189, 2, 160},
-	[CHAN_ENUM_6905] = {6905, 193, 2, 160},
-	[CHAN_ENUM_6925] = {6925, 197, 2, 160},
-	[CHAN_ENUM_6945] = {6945, 201, 2, 160},
-	[CHAN_ENUM_6965] = {6965, 205, 2, 160},
-	[CHAN_ENUM_6985] = {6985, 209, 2, 160},
-	[CHAN_ENUM_7005] = {7005, 213, 2, 160},
-	[CHAN_ENUM_7025] = {7025, 217, 2, 160},
-	[CHAN_ENUM_7045] = {7045, 221, 2, 160},
-	[CHAN_ENUM_7065] = {7065, 225, 2, 160},
-	[CHAN_ENUM_7085] = {7085, 229, 2, 160},
-	[CHAN_ENUM_7105] = {7105, 233, 2, 160}
+	[CHAN_ENUM_5935] = {5935, 2, 2, 20},
+	[CHAN_ENUM_5955] = {5955, 1, 2, 160},
+	[CHAN_ENUM_5975] = {5975, 5, 2, 160},
+	[CHAN_ENUM_5995] = {5995, 9, 2, 160},
+	[CHAN_ENUM_6015] = {6015, 13, 2, 160},
+	[CHAN_ENUM_6035] = {6035, 17, 2, 160},
+	[CHAN_ENUM_6055] = {6055, 21, 2, 160},
+	[CHAN_ENUM_6075] = {6075, 25, 2, 160},
+	[CHAN_ENUM_6095] = {6095, 29, 2, 160},
+	[CHAN_ENUM_6115] = {6115, 33, 2, 160},
+	[CHAN_ENUM_6135] = {6135, 37, 2, 160},
+	[CHAN_ENUM_6155] = {6155, 41, 2, 160},
+	[CHAN_ENUM_6175] = {6175, 45, 2, 160},
+	[CHAN_ENUM_6195] = {6195, 49, 2, 160},
+	[CHAN_ENUM_6215] = {6215, 53, 2, 160},
+	[CHAN_ENUM_6235] = {6235, 57, 2, 160},
+	[CHAN_ENUM_6255] = {6255, 61, 2, 160},
+	[CHAN_ENUM_6275] = {6275, 65, 2, 160},
+	[CHAN_ENUM_6295] = {6295, 69, 2, 160},
+	[CHAN_ENUM_6315] = {6315, 73, 2, 160},
+	[CHAN_ENUM_6335] = {6335, 77, 2, 160},
+	[CHAN_ENUM_6355] = {6355, 81, 2, 160},
+	[CHAN_ENUM_6375] = {6375, 85, 2, 160},
+	[CHAN_ENUM_6395] = {6395, 89, 2, 160},
+	[CHAN_ENUM_6415] = {6415, 93, 2, 160},
+	[CHAN_ENUM_6435] = {6435, 97, 2, 160},
+	[CHAN_ENUM_6455] = {6455, 101, 2, 160},
+	[CHAN_ENUM_6475] = {6475, 105, 2, 160},
+	[CHAN_ENUM_6495] = {6495, 109, 2, 160},
+	[CHAN_ENUM_6515] = {6515, 113, 2, 160},
+	[CHAN_ENUM_6535] = {6535, 117, 2, 160},
+	[CHAN_ENUM_6555] = {6555, 121, 2, 160},
+	[CHAN_ENUM_6575] = {6575, 125, 2, 160},
+	[CHAN_ENUM_6595] = {6595, 129, 2, 160},
+	[CHAN_ENUM_6615] = {6615, 133, 2, 160},
+	[CHAN_ENUM_6635] = {6635, 137, 2, 160},
+	[CHAN_ENUM_6655] = {6655, 141, 2, 160},
+	[CHAN_ENUM_6675] = {6675, 145, 2, 160},
+	[CHAN_ENUM_6695] = {6695, 149, 2, 160},
+	[CHAN_ENUM_6715] = {6715, 153, 2, 160},
+	[CHAN_ENUM_6735] = {6735, 157, 2, 160},
+	[CHAN_ENUM_6755] = {6755, 161, 2, 160},
+	[CHAN_ENUM_6775] = {6775, 165, 2, 160},
+	[CHAN_ENUM_6795] = {6795, 169, 2, 160},
+	[CHAN_ENUM_6815] = {6815, 173, 2, 160},
+	[CHAN_ENUM_6835] = {6835, 177, 2, 160},
+	[CHAN_ENUM_6855] = {6855, 181, 2, 160},
+	[CHAN_ENUM_6875] = {6875, 185, 2, 160},
+	[CHAN_ENUM_6895] = {6895, 189, 2, 160},
+	[CHAN_ENUM_6915] = {6915, 193, 2, 160},
+	[CHAN_ENUM_6935] = {6935, 197, 2, 160},
+	[CHAN_ENUM_6955] = {6955, 201, 2, 160},
+	[CHAN_ENUM_6975] = {6975, 205, 2, 160},
+	[CHAN_ENUM_6995] = {6995, 209, 2, 160},
+	[CHAN_ENUM_7015] = {7015, 213, 2, 160},
+	[CHAN_ENUM_7035] = {7035, 217, 2, 160},
+	[CHAN_ENUM_7055] = {7055, 221, 2, 160},
+	[CHAN_ENUM_7075] = {7075, 225, 2, 160},
+	[CHAN_ENUM_7095] = {7095, 229, 2, 160},
+	[CHAN_ENUM_7115] = {7115, 233, 2, 160}
 #endif /* CONFIG_BAND_6GHZ */
 };
 
@@ -1772,6 +1777,9 @@ static uint16_t reg_compute_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 				break;
 			continue;
 		} else if ((chan_list[count].chan_num >= chan_num) &&
+			   (chan_list[count].state != CHANNEL_STATE_DISABLE) &&
+			   !(chan_list[count].chan_flags &
+			     REGULATORY_CHAN_DISABLED) &&
 			   (chan_list[count].chan_num != INVALID_CHANNEL_NUM))
 			break;
 	}
@@ -2549,7 +2557,7 @@ bool reg_is_6ghz_psc_chan_freq(uint16_t freq)
 		return false;
 	}
 
-	if (!(((freq - SIXG_STARTING_FREQ) + (FREQ_LEFT_SHIFT)) %
+	if (!(((freq - SIX_GHZ_NON_ORPHAN_START_FREQ) + FREQ_LEFT_SHIFT) %
 	      (FREQ_TO_CHAN_SCALE * NUM_80MHZ_BAND_IN_6G))) {
 		return true;
 	}
@@ -3423,14 +3431,9 @@ static void reg_set_5g_channel_params_for_freq(struct wlan_objmgr_pdev *pdev,
 		if (ch_params->ch_width <= CH_WIDTH_20MHZ) {
 			ch_params->sec_ch_offset = NO_SEC_CH;
 			ch_params->mhz_freq_seg0 = freq;
-			if (reg_is_6ghz_chan_freq(ch_params->mhz_freq_seg0))
 				ch_params->center_freq_seg0 =
-				(ch_params->mhz_freq_seg0 -
-				 SIXG_STARTING_FREQ) / FREQ_TO_CHAN_SCALE;
-			else
-				ch_params->center_freq_seg0 =
-				(ch_params->mhz_freq_seg0 -
-				 FIVEG_STARTING_FREQ) / FREQ_TO_CHAN_SCALE;
+				reg_freq_to_chan(pdev,
+						 ch_params->mhz_freq_seg0);
 			break;
 		} else if (ch_params->ch_width >= CH_WIDTH_40MHZ) {
 			reg_get_5g_bonded_chan_array_for_freq(
@@ -3447,14 +3450,9 @@ static void reg_set_5g_channel_params_for_freq(struct wlan_objmgr_pdev *pdev,
 			ch_params->mhz_freq_seg0 =
 				(bonded_chan_ptr->start_freq +
 				 bonded_chan_ptr->end_freq) / 2;
-			if (reg_is_6ghz_chan_freq(ch_params->mhz_freq_seg0))
 				ch_params->center_freq_seg0 =
-				(ch_params->mhz_freq_seg0 -
-				 SIXG_STARTING_FREQ) / FREQ_TO_CHAN_SCALE;
-			else
-				ch_params->center_freq_seg0 =
-				(ch_params->mhz_freq_seg0 -
-				 FIVEG_STARTING_FREQ) / FREQ_TO_CHAN_SCALE;
+				reg_freq_to_chan(pdev,
+						 ch_params->mhz_freq_seg0);
 			break;
 		}
 update_bw:
@@ -3463,28 +3461,19 @@ update_bw:
 
 	if (ch_params->ch_width == CH_WIDTH_160MHZ) {
 		ch_params->mhz_freq_seg1 = ch_params->mhz_freq_seg0;
-		if (reg_is_6ghz_chan_freq(ch_params->mhz_freq_seg1))
 			ch_params->center_freq_seg1 =
-			(ch_params->mhz_freq_seg1 - SIXG_STARTING_FREQ) /
-			 FREQ_TO_CHAN_SCALE;
-		else
-			ch_params->center_freq_seg1 =
-			(ch_params->mhz_freq_seg1 - FIVEG_STARTING_FREQ) /
-			 FREQ_TO_CHAN_SCALE;
+				reg_freq_to_chan(pdev,
+						 ch_params->mhz_freq_seg1);
+
 		chan_state = reg_get_5g_bonded_channel_for_freq(
 				pdev, freq, CH_WIDTH_80MHZ, &bonded_chan_ptr);
 		if (bonded_chan_ptr) {
 			ch_params->mhz_freq_seg0 =
 				(bonded_chan_ptr->start_freq +
 				 bonded_chan_ptr->end_freq) / 2;
-			if (reg_is_6ghz_chan_freq(ch_params->mhz_freq_seg0))
-				ch_params->center_freq_seg0 =
-				(ch_params->mhz_freq_seg0 -
-				 SIXG_STARTING_FREQ) / FREQ_TO_CHAN_SCALE;
-			else
 				ch_params->center_freq_seg0 =
-				(ch_params->mhz_freq_seg0 -
-				 FIVEG_STARTING_FREQ) / FREQ_TO_CHAN_SCALE;
+				reg_freq_to_chan(pdev,
+						 ch_params->mhz_freq_seg0);
 		}
 	}
 

umac/regulatory/core/src/reg_services_common.h

@@ -93,7 +93,9 @@
 				  center_freq + HALF_20MHZ_BW)
 
 #define FREQ_LEFT_SHIFT         55
-#define SIXG_STARTING_FREQ      5940
+#define SIX_GHZ_NON_ORPHAN_START_FREQ \
+	(channel_map_global[MIN_6GHZ_NON_ORPHAN_CHANNEL].center_freq  - 5)
+#define CHAN_FREQ_5935          5935
 #define NUM_80MHZ_BAND_IN_6G    16
 #define NUM_PSC_FREQ            15
 #define PSC_BAND_MHZ (FREQ_TO_CHAN_SCALE * NUM_80MHZ_BAND_IN_6G)
@@ -101,7 +103,8 @@
 #define REG_MAX_6GHZ_CHAN_FREQ channel_map[MAX_6GHZ_CHANNEL].center_freq
 #else
 #define FREQ_LEFT_SHIFT         0
-#define SIXG_STARTING_FREQ      0
+#define SIX_GHZ_NON_ORPHAN_START_FREQ       0
+#define CHAN_FREQ_5935          0
 #define NUM_80MHZ_BAND_IN_6G    0
 #define NUM_PSC_FREQ            0
 #define PSC_BAND_MHZ (FREQ_TO_CHAN_SCALE * NUM_80MHZ_BAND_IN_6G)
@@ -115,7 +118,7 @@
 /* EEPROM setting is a country code */
 #define    COUNTRY_ERD_FLAG     0x8000
 #define MIN_6GHZ_OPER_CLASS 131
-#define MAX_6GHZ_OPER_CLASS 135
+#define MAX_6GHZ_OPER_CLASS 136
 
 extern const struct chan_map *channel_map;
 extern const struct chan_map channel_map_us[];

umac/regulatory/dispatcher/inc/reg_services_public_struct.h

@@ -211,65 +211,66 @@ enum op_class_table_num {
  * @CHAN_ENUM_5910: channel with freq 5910
  * @CHAN_ENUM_5915: channel with freq 5915
  * @CHAN_ENUM_5920: channel with freq 5920
- * @CHAN_ENUM_5945: channel with freq 5945
- * @CHAN_ENUM_5965: channel with freq 5965
- * @CHAN_ENUM_5985: channel with freq 5985
- * @CHAN_ENUM_6005: channel with freq 6005
- * @CHAN_ENUM_6025: channel with freq 6025
- * @CHAN_ENUM_6045: channel with freq 6045
- * @CHAN_ENUM_6065: channel with freq 6065
- * @CHAN_ENUM_6085: channel with freq 6085
- * @CHAN_ENUM_6105: channel with freq 6105
- * @CHAN_ENUM_6125: channel with freq 6125
- * @CHAN_ENUM_6145: channel with freq 6145
- * @CHAN_ENUM_6165: channel with freq 6165
- * @CHAN_ENUM_6185: channel with freq 6185
- * @CHAN_ENUM_6205: channel with freq 6205
- * @CHAN_ENUM_6225: channel with freq 6225
- * @CHAN_ENUM_6245: channel with freq 6245
- * @CHAN_ENUM_6265: channel with freq 6265
- * @CHAN_ENUM_6285: channel with freq 6285
- * @CHAN_ENUM_6305: channel with freq 6305
- * @CHAN_ENUM_6325: channel with freq 6325
- * @CHAN_ENUM_6345: channel with freq 6345
- * @CHAN_ENUM_6365: channel with freq 6365
- * @CHAN_ENUM_6385: channel with freq 6385
- * @CHAN_ENUM_6405: channel with freq 6405
- * @CHAN_ENUM_6425: channel with freq 6425
- * @CHAN_ENUM_6445: channel with freq 6445
- * @CHAN_ENUM_6465: channel with freq 6465
- * @CHAN_ENUM_6485: channel with freq 6485
- * @CHAN_ENUM_6505: channel with freq 6505
- * @CHAN_ENUM_6525: channel with freq 6525
- * @CHAN_ENUM_6545: channel with freq 6545
- * @CHAN_ENUM_6565: channel with freq 6565
- * @CHAN_ENUM_6585: channel with freq 6585
- * @CHAN_ENUM_6605: channel with freq 6605
- * @CHAN_ENUM_6625: channel with freq 6625
- * @CHAN_ENUM_6645: channel with freq 6645
- * @CHAN_ENUM_6665: channel with freq 6665
- * @CHAN_ENUM_6685: channel with freq 6685
- * @CHAN_ENUM_6705: channel with freq 6705
- * @CHAN_ENUM_6725: channel with freq 6725
- * @CHAN_ENUM_6745: channel with freq 6745
- * @CHAN_ENUM_6765: channel with freq 6765
- * @CHAN_ENUM_6785: channel with freq 6785
- * @CHAN_ENUM_6805: channel with freq 6805
- * @CHAN_ENUM_6825: channel with freq 6825
- * @CHAN_ENUM_6845: channel with freq 6845
- * @CHAN_ENUM_6865: channel with freq 6865
- * @CHAN_ENUM_6885: channel with freq 6885
- * @CHAN_ENUM_6905: channel with freq 6905
- * @CHAN_ENUM_6925: channel with freq 6925
- * @CHAN_ENUM_6945: channel with freq 6945
- * @CHAN_ENUM_6965: channel with freq 6965
- * @CHAN_ENUM_6985: channel with freq 6985
- * @CHAN_ENUM_7005: channel with freq 7005
- * @CHAN_ENUM_7025: channel with freq 7025
- * @CHAN_ENUM_7045: channel with freq 7045
- * @CHAN_ENUM_7065: channel with freq 7065
- * @CHAN_ENUM_7085: channel with freq 7085
- * @CHAN_ENUM_7105: channel with freq 7105
+ * @CHAN_ENUM_5935: channel with freq 5935
+ * @CHAN_ENUM_5955: channel with freq 5955
+ * @CHAN_ENUM_5975: channel with freq 5975
+ * @CHAN_ENUM_5995: channel with freq 5995
+ * @CHAN_ENUM_6015: channel with freq 6015
+ * @CHAN_ENUM_6035: channel with freq 6035
+ * @CHAN_ENUM_6055: channel with freq 6055
+ * @CHAN_ENUM_6075: channel with freq 6075
+ * @CHAN_ENUM_6095: channel with freq 6095
+ * @CHAN_ENUM_6115: channel with freq 6115
+ * @CHAN_ENUM_6135: channel with freq 6135
+ * @CHAN_ENUM_6155: channel with freq 6155
+ * @CHAN_ENUM_6175: channel with freq 6175
+ * @CHAN_ENUM_6195: channel with freq 6195
+ * @CHAN_ENUM_6215: channel with freq 6215
+ * @CHAN_ENUM_6235: channel with freq 6235
+ * @CHAN_ENUM_6255: channel with freq 6255
+ * @CHAN_ENUM_6275: channel with freq 6275
+ * @CHAN_ENUM_6295: channel with freq 6295
+ * @CHAN_ENUM_6315: channel with freq 6315
+ * @CHAN_ENUM_6335: channel with freq 6335
+ * @CHAN_ENUM_6355: channel with freq 6355
+ * @CHAN_ENUM_6375: channel with freq 6375
+ * @CHAN_ENUM_6395: channel with freq 6395
+ * @CHAN_ENUM_6415: channel with freq 6415
+ * @CHAN_ENUM_6435: channel with freq 6435
+ * @CHAN_ENUM_6455: channel with freq 6455
+ * @CHAN_ENUM_6475: channel with freq 6475
+ * @CHAN_ENUM_6495: channel with freq 6495
+ * @CHAN_ENUM_6515: channel with freq 6515
+ * @CHAN_ENUM_6535: channel with freq 6535
+ * @CHAN_ENUM_6555: channel with freq 6555
+ * @CHAN_ENUM_6575: channel with freq 6575
+ * @CHAN_ENUM_6595: channel with freq 6595
+ * @CHAN_ENUM_6615: channel with freq 6615
+ * @CHAN_ENUM_6635: channel with freq 6635
+ * @CHAN_ENUM_6655: channel with freq 6655
+ * @CHAN_ENUM_6675: channel with freq 6675
+ * @CHAN_ENUM_6695: channel with freq 6695
+ * @CHAN_ENUM_6715: channel with freq 6715
+ * @CHAN_ENUM_6735: channel with freq 6735
+ * @CHAN_ENUM_6755: channel with freq 6755
+ * @CHAN_ENUM_6775: channel with freq 6775
+ * @CHAN_ENUM_6795: channel with freq 6795
+ * @CHAN_ENUM_6815: channel with freq 6815
+ * @CHAN_ENUM_6835: channel with freq 6835
+ * @CHAN_ENUM_6855: channel with freq 6855
+ * @CHAN_ENUM_6875: channel with freq 6875
+ * @CHAN_ENUM_6895: channel with freq 6895
+ * @CHAN_ENUM_6915: channel with freq 6915
+ * @CHAN_ENUM_6935: channel with freq 6935
+ * @CHAN_ENUM_6955: channel with freq 6955
+ * @CHAN_ENUM_6975: channel with freq 6975
+ * @CHAN_ENUM_6995: channel with freq 6995
+ * @CHAN_ENUM_7015: channel with freq 7015
+ * @CHAN_ENUM_7035: channel with freq 7035
+ * @CHAN_ENUM_7055: channel with freq 7055
+ * @CHAN_ENUM_7075: channel with freq 7075
+ * @CHAN_ENUM_7095: channel with freq 7095
+ * @CHAN_ENUM_7115: channel with freq 7115
  */
 enum channel_enum {
 	CHAN_ENUM_2412,
@@ -373,65 +374,66 @@ enum channel_enum {
 	CHAN_ENUM_5915,
 	CHAN_ENUM_5920,
 #ifdef CONFIG_BAND_6GHZ
-	CHAN_ENUM_5945,
-	CHAN_ENUM_5965,
-	CHAN_ENUM_5985,
-	CHAN_ENUM_6005,
-	CHAN_ENUM_6025,
-	CHAN_ENUM_6045,
-	CHAN_ENUM_6065,
-	CHAN_ENUM_6085,
-	CHAN_ENUM_6105,
-	CHAN_ENUM_6125,
-	CHAN_ENUM_6145,
-	CHAN_ENUM_6165,
-	CHAN_ENUM_6185,
-	CHAN_ENUM_6205,
-	CHAN_ENUM_6225,
-	CHAN_ENUM_6245,
-	CHAN_ENUM_6265,
-	CHAN_ENUM_6285,
-	CHAN_ENUM_6305,
-	CHAN_ENUM_6325,
-	CHAN_ENUM_6345,
-	CHAN_ENUM_6365,
-	CHAN_ENUM_6385,
-	CHAN_ENUM_6405,
-	CHAN_ENUM_6425,
-	CHAN_ENUM_6445,
-	CHAN_ENUM_6465,
-	CHAN_ENUM_6485,
-	CHAN_ENUM_6505,
-	CHAN_ENUM_6525,
-	CHAN_ENUM_6545,
-	CHAN_ENUM_6565,
-	CHAN_ENUM_6585,
-	CHAN_ENUM_6605,
-	CHAN_ENUM_6625,
-	CHAN_ENUM_6645,
-	CHAN_ENUM_6665,
-	CHAN_ENUM_6685,
-	CHAN_ENUM_6705,
-	CHAN_ENUM_6725,
-	CHAN_ENUM_6745,
-	CHAN_ENUM_6765,
-	CHAN_ENUM_6785,
-	CHAN_ENUM_6805,
-	CHAN_ENUM_6825,
-	CHAN_ENUM_6845,
-	CHAN_ENUM_6865,
-	CHAN_ENUM_6885,
-	CHAN_ENUM_6905,
-	CHAN_ENUM_6925,
-	CHAN_ENUM_6945,
-	CHAN_ENUM_6965,
-	CHAN_ENUM_6985,
-	CHAN_ENUM_7005,
-	CHAN_ENUM_7025,
-	CHAN_ENUM_7045,
-	CHAN_ENUM_7065,
-	CHAN_ENUM_7085,
-	CHAN_ENUM_7105,
+	CHAN_ENUM_5935,
+	CHAN_ENUM_5955,
+	CHAN_ENUM_5975,
+	CHAN_ENUM_5995,
+	CHAN_ENUM_6015,
+	CHAN_ENUM_6035,
+	CHAN_ENUM_6055,
+	CHAN_ENUM_6075,
+	CHAN_ENUM_6095,
+	CHAN_ENUM_6115,
+	CHAN_ENUM_6135,
+	CHAN_ENUM_6155,
+	CHAN_ENUM_6175,
+	CHAN_ENUM_6195,
+	CHAN_ENUM_6215,
+	CHAN_ENUM_6235,
+	CHAN_ENUM_6255,
+	CHAN_ENUM_6275,
+	CHAN_ENUM_6295,
+	CHAN_ENUM_6315,
+	CHAN_ENUM_6335,
+	CHAN_ENUM_6355,
+	CHAN_ENUM_6375,
+	CHAN_ENUM_6395,
+	CHAN_ENUM_6415,
+	CHAN_ENUM_6435,
+	CHAN_ENUM_6455,
+	CHAN_ENUM_6475,
+	CHAN_ENUM_6495,
+	CHAN_ENUM_6515,
+	CHAN_ENUM_6535,
+	CHAN_ENUM_6555,
+	CHAN_ENUM_6575,
+	CHAN_ENUM_6595,
+	CHAN_ENUM_6615,
+	CHAN_ENUM_6635,
+	CHAN_ENUM_6655,
+	CHAN_ENUM_6675,
+	CHAN_ENUM_6695,
+	CHAN_ENUM_6715,
+	CHAN_ENUM_6735,
+	CHAN_ENUM_6755,
+	CHAN_ENUM_6775,
+	CHAN_ENUM_6795,
+	CHAN_ENUM_6815,
+	CHAN_ENUM_6835,
+	CHAN_ENUM_6855,
+	CHAN_ENUM_6875,
+	CHAN_ENUM_6895,
+	CHAN_ENUM_6915,
+	CHAN_ENUM_6935,
+	CHAN_ENUM_6955,
+	CHAN_ENUM_6975,
+	CHAN_ENUM_6995,
+	CHAN_ENUM_7015,
+	CHAN_ENUM_7035,
+	CHAN_ENUM_7055,
+	CHAN_ENUM_7075,
+	CHAN_ENUM_7095,
+	CHAN_ENUM_7115,
 #endif /* CONFIG_BAND_6GHZ */
 
 	NUM_CHANNELS,
@@ -467,13 +469,15 @@ enum channel_enum {
 #endif
 
 #ifdef CONFIG_BAND_6GHZ
-	MIN_6GHZ_CHANNEL = CHAN_ENUM_5945,
-	MAX_6GHZ_CHANNEL = CHAN_ENUM_7105,
+	MIN_6GHZ_CHANNEL = CHAN_ENUM_5935,
+	MAX_6GHZ_CHANNEL = CHAN_ENUM_7115,
 	NUM_6GHZ_CHANNELS = (MAX_6GHZ_CHANNEL - MIN_6GHZ_CHANNEL + 1),
+	MIN_6GHZ_NON_ORPHAN_CHANNEL = CHAN_ENUM_5955,
 #else
 	MIN_6GHZ_CHANNEL = INVALID_CHANNEL,
 	MAX_6GHZ_CHANNEL = INVALID_CHANNEL,
 	NUM_6GHZ_CHANNELS = 0,
+	MIN_6GHZ_NON_ORPHAN_CHANNEL = INVALID_CHANNEL,
 #endif /* CONFIG_BAND_6GHZ */
 };