From 2a46442db503a9cbd03fbaddd9f626a17314a733 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Sirasanagandla Date: Tue, 6 Jun 2017 13:27:56 +0530 Subject: [PATCH] qcacmn: 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: I0407d30c6cd6f7f485d767c97bc5381c9c731440 CRs-Fixed: 2056847 --- wmi/inc/wmi_unified_api.h | 4 ++-- wmi/inc/wmi_unified_priv.h | 4 ++-- wmi/src/wmi_unified_api.c | 4 ++-- wmi/src/wmi_unified_tlv.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index 01dccc77d9e5..a2892873b030 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -790,8 +790,8 @@ QDF_STATUS wmi_unified_process_ch_avoid_update_cmd(void *wmi_hdl); QDF_STATUS wmi_unified_send_regdomain_info_to_fw_cmd(void *wmi_hdl, 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); QDF_STATUS wmi_unified_set_tdls_offchan_mode_cmd(void *wmi_hdl, struct tdls_channel_switch_params *chan_switch_params); diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index 65dc5bf1c13c..86581f4e6aac 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -652,8 +652,8 @@ QDF_STATUS (*send_process_ch_avoid_update_cmd)(wmi_unified_t wmi_handle); QDF_STATUS (*send_regdomain_info_to_fw_cmd)(wmi_unified_t wmi_handle, 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); QDF_STATUS (*send_set_tdls_offchan_mode_cmd)(wmi_unified_t wmi_handle, struct tdls_channel_switch_params *chan_switch_params); diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index 3d7192fd5a7d..a91cbd7ddf19 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -2633,8 +2633,8 @@ QDF_STATUS wmi_unified_process_ch_avoid_update_cmd(void *wmi_hdl) */ QDF_STATUS wmi_unified_send_regdomain_info_to_fw_cmd(void *wmi_hdl, 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) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 621369f24d80..2f3a056f1a52 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -9251,8 +9251,8 @@ send_pdev_set_regdomain_cmd_tlv(wmi_unified_t wmi_handle, */ static QDF_STATUS send_regdomain_info_to_fw_cmd_tlv(wmi_unified_t wmi_handle, 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) { wmi_buf_t buf; wmi_pdev_set_regdomain_cmd_fixed_param *cmd;