Bläddra i källkod

qcacld-3.0: Send proper CTL info to fw in world regd

Currently, for world regd and some other regds where conformance test
limit is NO_CTL, host is sending invalid CTL info to fw instead of
NO_CTL (0xff) due to type conversion issues.

To fix this, use proper unsigned type for CTL info.

Change-Id: I6aff04f0142b5c8e4ff2ea91d85ae7108390c89f
CRs-Fixed: 2056834
Rajeev Kumar Sirasanagandla 7 år sedan
förälder
incheckning
873b6d9b66
3 ändrade filer med 5 tillägg och 5 borttagningar
  1. 1 1
      core/cds/src/cds_regdomain.c
  2. 2 2
      core/wma/inc/wma.h
  3. 2 2
      core/wma/src/wma_features.c

+ 1 - 1
core/cds/src/cds_regdomain.c

@@ -621,7 +621,7 @@ void cds_fill_and_send_ctl_to_fw(struct regulatory *reg)
 {
 	const struct reg_dmn *reg_dmn_2g = NULL;
 	const struct reg_dmn *reg_dmn_5g = NULL;
-	int8_t ctl_2g, ctl_5g;
+	uint8_t ctl_2g, ctl_5g;
 	const struct reg_dmn_pair *regpair;
 	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 

+ 2 - 2
core/wma/inc/wma.h

@@ -1601,8 +1601,8 @@ typedef struct qdf_packed sHalMacStartParameter {
 
 extern void cds_wma_complete_cback(void *p_cds_context);
 extern void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G,
-					  uint16_t regdmn5G, int8_t ctl2G,
-					  int8_t ctl5G);
+					  uint16_t regdmn5G, uint8_t ctl2G,
+					  uint8_t ctl5G);
 /**
  * enum frame_index - Frame index
  * @GENERIC_NODOWNLD_NOACK_COMP_INDEX: Frame index for no download comp no ack

+ 2 - 2
core/wma/src/wma_features.c

@@ -3827,8 +3827,8 @@ QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle,
  * Return: none
  */
 void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G,
-				   uint16_t regdmn5G, int8_t ctl2G,
-				   int8_t ctl5G)
+				   uint16_t regdmn5G, uint8_t ctl2G,
+				   uint8_t ctl5G)
 {
 	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 	int32_t cck_mask_val = 0;