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

qcacld-3.0: Remove wlan_reg_chan_to_freq in wlan_mlme_main.c

Browse Source 
Remove useless legacy CFG_VALID_CHANNEL_LIST ini.
Remove wlan_reg_chan_to_freq in wlan_mlme_main.c.

Change-Id: I7368f03fde6cc190c231f3b053811215796ed8d2
CRs-Fixed: 2777094
This commit is contained in:
Jianmin Zhu
2020-09-15 10:40:46 +08:00
committed by snandini
parent a4e47ce584
commit 6e500465bb
3 changed files with 0 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/mlme/core/src/wlan_mlme_main.c
View File

@@ -2229,11 +2229,6 @@ static void mlme_init_acs_avoid_freq_list(struct wlan_objmgr_psoc *psoc,
static void mlme_init_reg_cfg(struct wlan_objmgr_psoc *psoc, static void mlme_init_reg_cfg(struct wlan_objmgr_psoc *psoc,
struct wlan_mlme_reg *reg) struct wlan_mlme_reg *reg)
{ {
qdf_size_t valid_channel_list_num = 0;
uint8_t channel_list[CFG_VALID_CHANNEL_LIST_LEN];
uint8_t i;
struct wlan_objmgr_pdev *pdev = NULL;
reg->self_gen_frm_pwr = cfg_get(psoc, CFG_SELF_GEN_FRM_PWR); reg->self_gen_frm_pwr = cfg_get(psoc, CFG_SELF_GEN_FRM_PWR);
reg->etsi_srd_chan_in_master_mode = reg->etsi_srd_chan_in_master_mode =
cfg_get(psoc, CFG_ETSI_SRD_CHAN_IN_MASTER_MODE); cfg_get(psoc, CFG_ETSI_SRD_CHAN_IN_MASTER_MODE);
@@ -2253,24 +2248,6 @@ static void mlme_init_reg_cfg(struct wlan_objmgr_psoc *psoc,
reg->retain_nol_across_regdmn_update = reg->retain_nol_across_regdmn_update =
cfg_get(psoc, CFG_RETAIN_NOL_ACROSS_REG_DOMAIN); cfg_get(psoc, CFG_RETAIN_NOL_ACROSS_REG_DOMAIN);
qdf_uint8_array_parse(cfg_default(CFG_VALID_CHANNEL_LIST),
channel_list,
CFG_VALID_CHANNEL_LIST_LEN,
&valid_channel_list_num);
reg->valid_channel_list_num = (uint8_t)valid_channel_list_num;
pdev = wlan_objmgr_get_pdev_by_id(psoc, 0, WLAN_MLME_NB_ID);
if (!pdev) {
mlme_legacy_err("null pdev");
return;
}
for (i = 0; i < valid_channel_list_num; i++)
reg->valid_channel_freq_list[i] =
wlan_reg_chan_to_freq(pdev, channel_list[i]);
wlan_objmgr_pdev_release_ref(pdev, WLAN_MLME_NB_ID);
mlme_init_acs_avoid_freq_list(psoc, reg); mlme_init_acs_avoid_freq_list(psoc, reg);
} }

19
components/mlme/dispatcher/inc/cfg_mlme_reg.h
View File

@@ -23,8 +23,6 @@
#ifndef CFG_MLME_REG_H__ #ifndef CFG_MLME_REG_H__
#define CFG_MLME_REG_H__ #define CFG_MLME_REG_H__
#define VALID_CHANNEL_LIST_DEFAULT "36, 40, 44, 48, 52, 56, 60, 64, 1, 6, 11, 34, 38, 42, 46, 2, 3, 4, 5, 7, 8, 9, 10, 12, 13, 14, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 151, 153, 155, 157, 159, 161, 50, 54, 58, 62, 240, 242, 244, 246, 248, 250, 252"
/* /*
* <ini> * <ini>
* gSelfGenFrmPwr - self-generated frame power in tx chain mask * gSelfGenFrmPwr - self-generated frame power in tx chain mask
@@ -243,22 +241,6 @@
CFG_VALUE_OR_DEFAULT, \ CFG_VALUE_OR_DEFAULT, \
"set the 11d scan interval in FW") "set the 11d scan interval in FW")
/*
* valid_chan_list - Configure valid channel list
* @Default: VALID_CHANNEL_LIST_DEFAULT
*
* This ini is used to configure valid channel list
*
* Usage: Internal
*
*/
#define CFG_VALID_CHANNEL_LIST CFG_STRING( \
"valid_chan_list", \
0, \
CFG_VALID_CHANNEL_LIST_STRING_LEN, \
VALID_CHANNEL_LIST_DEFAULT, \
"valid channel list")
/* /*
* <ini> * <ini>
* ignore_fw_reg_offload_ind - If set, Ignore the FW offload indication * ignore_fw_reg_offload_ind - If set, Ignore the FW offload indication
@@ -337,7 +319,6 @@
CFG(CFG_RESTART_BEACONING_ON_CH_AVOID) \ CFG(CFG_RESTART_BEACONING_ON_CH_AVOID) \
CFG(CFG_INDOOR_CHANNEL_SUPPORT) \ CFG(CFG_INDOOR_CHANNEL_SUPPORT) \
CFG(CFG_SCAN_11D_INTERVAL) \ CFG(CFG_SCAN_11D_INTERVAL) \
CFG(CFG_VALID_CHANNEL_LIST) \
CFG(CFG_IGNORE_FW_REG_OFFLOAD_IND) \ CFG(CFG_IGNORE_FW_REG_OFFLOAD_IND) \
CFG(CFG_RETAIN_NOL_ACROSS_REG_DOMAIN) \ CFG(CFG_RETAIN_NOL_ACROSS_REG_DOMAIN) \
CFG_SAP_AVOID_ACS_FREQ_LIST_ALL CFG_SAP_AVOID_ACS_FREQ_LIST_ALL

42
components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c
View File

@@ -1627,48 +1627,6 @@ ucfg_mlme_get_nol_across_regdmn(struct wlan_objmgr_psoc *psoc, bool *value)
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
QDF_STATUS
ucfg_mlme_get_valid_channel_freq_list(struct wlan_objmgr_psoc *psoc,
uint32_t *channel_list,
uint32_t *channel_list_num)
{
struct wlan_mlme_psoc_ext_obj *mlme_obj;
qdf_size_t valid_channel_list_num = 0;
uint8_t tmp_channel_list[CFG_VALID_CHANNEL_LIST_LEN];
uint8_t i;
struct wlan_objmgr_pdev *pdev = NULL;
mlme_obj = mlme_get_psoc_ext_obj(psoc);
if (!mlme_obj) {
qdf_uint8_array_parse(cfg_default(CFG_VALID_CHANNEL_LIST),
tmp_channel_list,
CFG_VALID_CHANNEL_LIST_LEN,
&valid_channel_list_num);
*channel_list_num = (uint8_t)valid_channel_list_num;
mlme_legacy_err("Failed to get MLME Obj");
pdev = wlan_objmgr_get_pdev_by_id(psoc, 0, WLAN_MLME_NB_ID);
if (!pdev) {
mlme_legacy_err("null pdev");
return QDF_STATUS_E_INVAL;
}
for (i = 0; i < valid_channel_list_num; i++) {
channel_list[i] =
wlan_reg_chan_to_freq(pdev, tmp_channel_list[i]);
}
wlan_objmgr_pdev_release_ref(pdev, WLAN_MLME_NB_ID);
return QDF_STATUS_E_INVAL;
}
*channel_list_num = (uint32_t)mlme_obj->cfg.reg.valid_channel_list_num;
for (i = 0; i < *channel_list_num; i++)
channel_list[i] = mlme_obj->cfg.reg.valid_channel_freq_list[i];
return QDF_STATUS_SUCCESS;
}
#ifdef FEATURE_LFR_SUBNET_DETECTION #ifdef FEATURE_LFR_SUBNET_DETECTION
QDF_STATUS QDF_STATUS
ucfg_mlme_is_subnet_detection_enabled(struct wlan_objmgr_psoc *psoc, bool *val) ucfg_mlme_is_subnet_detection_enabled(struct wlan_objmgr_psoc *psoc, bool *val)