samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Add cosmetic changes for fcc rule specific functions

Browse Source 
Place extract_ext_fcc_rules_from_wmi function near its
caller and modify function definiton of empty function
reg_set_pdev_fcc_rules.

Change-Id: I6918addbe81bb410355616023e0c6dac534700b6
CRs-Fixed: 3286479
This commit is contained in:
Asutosh Mohapatra
2022-09-09 14:16:41 +05:30
committed by Madan Koyyalamudi
parent 4f56107e25
commit db0def4e98
2 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
umac/regulatory/core/src/reg_build_chan_list.c
View File

@@ -2901,7 +2901,7 @@ static void reg_set_pdev_fcc_rules(
sizeof(struct cur_fcc_rule) * MAX_NUM_FCC_RULES); sizeof(struct cur_fcc_rule) * MAX_NUM_FCC_RULES);
} }
#else #else
static void reg_set_pdev_fcc_rules( static inline void reg_set_pdev_fcc_rules(
struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj, struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj,
struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj) struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj)
{ {

69
wmi/src/wmi_unified_tlv.c
View File

@@ -15167,41 +15167,6 @@ static uint16_t wmi_set_htc_tx_tag_tlv(wmi_unified_t wmi_handle,
} }
#ifdef CONFIG_BAND_6GHZ #ifdef CONFIG_BAND_6GHZ
#ifdef CONFIG_REG_CLIENT
/**
* extract_ext_fcc_rules_from_wmi - extract fcc rules from WMI TLV
* @num_fcc_rules: Number of FCC rules
* @wmi_fcc_rule: WMI FCC rules TLV
*
* Return fcc_rule_ptr
*/
static struct cur_fcc_rule
*extract_ext_fcc_rules_from_wmi(uint32_t num_fcc_rules,
wmi_regulatory_fcc_rule_struct *wmi_fcc_rule)
{
struct cur_fcc_rule *fcc_rule_ptr;
uint32_t count;
if (!wmi_fcc_rule)
return NULL;
fcc_rule_ptr = qdf_mem_malloc(num_fcc_rules *
sizeof(*fcc_rule_ptr));
if (!fcc_rule_ptr)
return NULL;
for (count = 0; count < num_fcc_rules; count++) {
fcc_rule_ptr[count].center_freq =
WMI_REG_FCC_RULE_CHAN_FREQ_GET(
wmi_fcc_rule[count].freq_info);
fcc_rule_ptr[count].tx_power =
WMI_REG_FCC_RULE_FCC_TX_POWER_GET(
wmi_fcc_rule[count].freq_info);
}
return fcc_rule_ptr;
}
#endif
static struct cur_reg_rule static struct cur_reg_rule
*create_ext_reg_rules_from_wmi(uint32_t num_reg_rules, *create_ext_reg_rules_from_wmi(uint32_t num_reg_rules,
@@ -15315,6 +15280,40 @@ static enum cc_setting_code wmi_reg_status_to_reg_status(
#ifdef CONFIG_REG_CLIENT #ifdef CONFIG_REG_CLIENT
#define MAX_NUM_FCC_RULES 2 #define MAX_NUM_FCC_RULES 2
/**
* extract_ext_fcc_rules_from_wmi - extract fcc rules from WMI TLV
* @num_fcc_rules: Number of FCC rules
* @wmi_fcc_rule: WMI FCC rules TLV
*
* Return fcc_rule_ptr
*/
static struct cur_fcc_rule
*extract_ext_fcc_rules_from_wmi(uint32_t num_fcc_rules,
wmi_regulatory_fcc_rule_struct *wmi_fcc_rule)
{
struct cur_fcc_rule *fcc_rule_ptr;
uint32_t count;
if (!wmi_fcc_rule)
return NULL;
fcc_rule_ptr = qdf_mem_malloc(num_fcc_rules *
sizeof(*fcc_rule_ptr));
if (!fcc_rule_ptr)
return NULL;
for (count = 0; count < num_fcc_rules; count++) {
fcc_rule_ptr[count].center_freq =
WMI_REG_FCC_RULE_CHAN_FREQ_GET(
wmi_fcc_rule[count].freq_info);
fcc_rule_ptr[count].tx_power =
WMI_REG_FCC_RULE_FCC_TX_POWER_GET(
wmi_fcc_rule[count].freq_info);
}
return fcc_rule_ptr;
}
/** /**
* extract_reg_fcc_rules_tlv - Extract reg fcc rules TLV * extract_reg_fcc_rules_tlv - Extract reg fcc rules TLV
* @param_buf - Pointer to WMI params TLV * @param_buf - Pointer to WMI params TLV