samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

qcacmn: Remove wlan_reg_set_channel_params

Selaa lähdekoodia 
- Remove wlan_reg_set_channel_params and the callers
 associated code.
- Clean up part of CONFIG_CHAN_NUM_API functions.

Change-Id: If9583e674752d6f47de8d7d6bc946909509957b5
CRs-Fixed: 2883773
This commit is contained in:
Amruta Kulkarni
2021-02-23 13:55:58 -08:00
committed by AnjaneeDevi Kapparapu
vanhempi 14d38b77fb
commit 7fe3773331
6 muutettua tiedostoa jossa 5 lisäystä ja 814 poistoa
Download Patch File Download Diff File Expand all files Collapse all files

46
umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h
Näytä tiedosto

@@ -450,27 +450,6 @@ QDF_STATUS utils_dfs_get_nol_chfreq_and_chwidth(struct wlan_objmgr_pdev *pdev,
uint32_t *nol_chwidth,
int index);
/**
* utils_dfs_get_random_channel() - Get random channel.
* @pdev: Pointer to DFS pdev object.
* @flags: random channel selection flags.
* @ch_params: current channel params.
* @hw_mode: current operating mode.
* @target_chan: Pointer to target_chan.
* @acs_info: acs range info.
*
* wrapper function for get_random_chan(). this
* function called from outside of dfs component.
*
* Return: QDF_STATUS
*/
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS utils_dfs_get_random_channel(struct wlan_objmgr_pdev *pdev,
uint16_t flags, struct ch_params *ch_params,
uint32_t *hw_mode, uint8_t *target_chan,
struct dfs_acs_info *acs_info);
#endif
/**
* utils_dfs_get_random_channel_for_freq() - Get random channel.
* @pdev: Pointer to DFS pdev object.
@@ -495,29 +474,7 @@ utils_dfs_get_random_channel_for_freq(struct wlan_objmgr_pdev *pdev,
#endif
/**
* utils_dfs_get_vdev_random_channel() - Get random channel for vdev
* @pdev: Pointer to DFS pdev object.
* @vdev: vdev of the request
* @flags: random channel selection flags.
* @ch_params: current channel params.
* @hw_mode: current operating mode.
* @target_chan: Pointer to target_chan.
* @acs_info: acs range info.
*
* Get random channel based on vdev interface type. If the vdev is null,
* the function will get random channel by SAP interface type.
*
* Return: QDF_STATUS
*/
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS utils_dfs_get_vdev_random_channel(
struct wlan_objmgr_pdev *pdev, struct wlan_objmgr_vdev *vdev,
uint16_t flags, struct ch_params *ch_params, uint32_t *hw_mode,
uint8_t *target_chan, struct dfs_acs_info *acs_info);
#endif
/**
* utils_dfs_get_vdev_random_channel() - Get random channel for vdev
* utils_dfs_get_vdev_random_channel_for_freq() - Get random channel for vdev
* @pdev: Pointer to DFS pdev object.
* @vdev: vdev of the request
* @flags: random channel selection flags.
@@ -531,7 +488,6 @@ QDF_STATUS utils_dfs_get_vdev_random_channel(
*
* Return: QDF_STATUS
*/
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS utils_dfs_get_vdev_random_channel_for_freq(
struct wlan_objmgr_pdev *pdev, struct wlan_objmgr_vdev *vdev,

91
umac/dfs/dispatcher/src/wlan_dfs_utils_api.c
Näytä tiedosto

@@ -931,81 +931,6 @@ bool utils_dfs_can_ignore_radar_event(struct wlan_objmgr_pdev *pdev)
}
#endif
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS utils_dfs_get_vdev_random_channel(
struct wlan_objmgr_pdev *pdev, struct wlan_objmgr_vdev *vdev,
uint16_t flags, struct ch_params *ch_params, uint32_t *hw_mode,
uint8_t *target_chan, struct dfs_acs_info *acs_info)
{
uint32_t dfs_reg;
uint32_t num_chan = NUM_CHANNELS;
struct wlan_dfs *dfs = NULL;
struct wlan_objmgr_psoc *psoc;
struct dfs_channel *chan_list = NULL;
struct dfs_channel cur_chan;
QDF_STATUS status = QDF_STATUS_E_FAILURE;
*target_chan = 0;
psoc = wlan_pdev_get_psoc(pdev);
if (!psoc) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null psoc");
goto random_chan_error;
}
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs");
goto random_chan_error;
}
wlan_reg_get_dfs_region(pdev, &dfs_reg);
chan_list = qdf_mem_malloc(num_chan * sizeof(*chan_list));
if (!chan_list)
goto random_chan_error;
utils_dfs_get_channel_list(pdev, vdev, chan_list, &num_chan);
if (!num_chan) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "zero channels");
goto random_chan_error;
}
cur_chan.dfs_ch_vhtop_ch_freq_seg1 = ch_params->center_freq_seg0;
cur_chan.dfs_ch_vhtop_ch_freq_seg2 = ch_params->center_freq_seg1;
if (!ch_params->ch_width)
utils_dfs_get_max_sup_width(pdev,
(uint8_t *)&ch_params->ch_width);
*target_chan = dfs_prepare_random_channel(dfs, chan_list,
num_chan, flags, (uint8_t *)&ch_params->ch_width,
&cur_chan, (uint8_t)dfs_reg, acs_info);
ch_params->center_freq_seg0 = cur_chan.dfs_ch_vhtop_ch_freq_seg1;
ch_params->center_freq_seg1 = cur_chan.dfs_ch_vhtop_ch_freq_seg2;
dfs_info(dfs, WLAN_DEBUG_DFS_RANDOM_CHAN,
"input width=%d", ch_params->ch_width);
if (*target_chan) {
wlan_reg_set_channel_params(pdev,
*target_chan, 0, ch_params);
utils_dfs_get_max_phy_mode(pdev, hw_mode);
status = QDF_STATUS_SUCCESS;
}
dfs_info(dfs, WLAN_DEBUG_DFS_RANDOM_CHAN,
"ch=%d, seg0=%d, seg1=%d, width=%d",
*target_chan, ch_params->center_freq_seg0,
ch_params->center_freq_seg1, ch_params->ch_width);
random_chan_error:
qdf_mem_free(chan_list);
return status;
}
qdf_export_symbol(utils_dfs_get_vdev_random_channel);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS utils_dfs_get_vdev_random_channel_for_freq(
struct wlan_objmgr_pdev *pdev, struct wlan_objmgr_vdev *vdev,
@@ -1075,22 +1000,6 @@ random_chan_error:
qdf_export_symbol(utils_dfs_get_vdev_random_channel_for_freq);
#endif
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS utils_dfs_get_random_channel(
struct wlan_objmgr_pdev *pdev,
uint16_t flags,
struct ch_params *ch_params,
uint32_t *hw_mode,
uint8_t *target_chan,
struct dfs_acs_info *acs_info)
{
return utils_dfs_get_vdev_random_channel(
pdev, NULL, flags, ch_params, hw_mode, target_chan,
acs_info);
}
qdf_export_symbol(utils_dfs_get_random_channel);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS utils_dfs_get_random_channel_for_freq(
struct wlan_objmgr_pdev *pdev,