Pārlūkot izejas kodu

qcacmn: Fix compilation errors in Host regdb

Fix the compilation errors observed in the Host regdb when the macro
WLAN_FEATURE_DSRC is enabled.

Change-Id: I2db0aee021db0233cad1c094df9095c25804871d
CRs-Fixed: 2894344
Hariharan Basuthkar 4 gadi atpakaļ
vecāks
revīzija
bc95e4ed45

+ 7 - 7
umac/regulatory/core/src/reg_db.c

@@ -656,7 +656,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(NEW_CALEDONIA, ETSI10_WORLD, 0, NC, 40, 160, 0, 0),
 	CE(NEW_ZEALAND, FCC3_ETSIC, 0, NZ, 40, 160, 0, 0),
 	CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
-	CE(NORTHERN_MARIANA_ISLANDS, FCC10_FCCA, 0, MP, 40, 160, 0),
+	CE(NORTHERN_MARIANA_ISLANDS, FCC10_FCCA, 0, MP, 40, 160, 0, 0),
 	CE(NICARAGUA, FCC3_FCCA, 0, NI, 40, 160, 0, 0),
 	CE(NIUE, ETSI10_WORLD, 0, NU, 40, 160, 0, 0),
 	CE(NORFOLK_ISLAND, FCC6_WORLD, 0, NF, 40, 160, 0, 0),
@@ -718,13 +718,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(UNITED_STATES, FCC8_FCCA, FCC1_6G, US, 40, 160, 160, 0),
 	CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC10_FCCA, 0, UM, 40, 160, 0,
 	   0),
-	CE(URUGUAY, FCC2_WORLD, 0, 0, UY, 40, 160, 0, 0),
-	CE(UZBEKISTAN, ETSI3_WORLD, 0, 0, UZ, 40, 160, 0, 0),
-	CE(VANUATU, FCC3_WORLD, 0, 0, VU, 40, 160, 0, 0),
-	CE(VENEZUELA, FCC2_ETSIC, 0, 0, VE, 40, 160, 0, 0),
-	CE(VIET_NAM, FCC3_WORLD, 0, 0, VN, 40, 80, 0, 0),
+	CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
+	CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 40, 160, 0, 0),
+	CE(VANUATU, FCC3_WORLD, 0, VU, 40, 160, 0, 0),
+	CE(VENEZUELA, FCC2_ETSIC, 0, VE, 40, 160, 0, 0),
+	CE(VIET_NAM, FCC3_WORLD, 0, VN, 40, 80, 0, 0),
 	CE(VIRGIN_ISLANDS, FCC10_FCCA, 0, VI, 40, 160, 0, 0),
-	CE(VIRGIN_ISLANDS_BRITISH, ETSI10_WORLD, 0, 0, VG, 40, 160, 0, 0),
+	CE(VIRGIN_ISLANDS_BRITISH, ETSI10_WORLD, 0, VG, 40, 160, 0, 0),
 	CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
 	CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
 	CE(ZIMBABWE, ETSI1_WORLD, 0, ZW, 40, 160, 0, 0),

+ 4 - 4
umac/regulatory/dispatcher/inc/reg_services_public_struct.h

@@ -479,14 +479,14 @@ enum channel_enum {
 #endif /* CONFIG_49GHZ_CHAN */
 
 	MIN_5GHZ_CHANNEL = CHAN_ENUM_5180,
-	MAX_5GHZ_CHANNEL = CHAN_ENUM_5885,
-	NUM_5GHZ_CHANNELS = (MAX_5GHZ_CHANNEL - MIN_5GHZ_CHANNEL + 1),
-
 #ifdef WLAN_FEATURE_DSRC
-	MIN_5GHZ_CHANNEL = CHAN_ENUM_5180,
 	MAX_5GHZ_CHANNEL = CHAN_ENUM_5920,
+#else
+	MAX_5GHZ_CHANNEL = CHAN_ENUM_5885,
+#endif
 	NUM_5GHZ_CHANNELS = (MAX_5GHZ_CHANNEL - MIN_5GHZ_CHANNEL + 1),
 
+#ifdef WLAN_FEATURE_DSRC
 	MIN_DSRC_CHANNEL = CHAN_ENUM_5850,
 	MAX_DSRC_CHANNEL = CHAN_ENUM_5920,
 	NUM_DSRC_CHANNELS = (MAX_DSRC_CHANNEL - MIN_DSRC_CHANNEL + 1),