samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Actions Packages Projekt Släpp Wiki Aktiviteter

qcacmn: Remove the unused CHAN_NUM functions

Bläddra i källkod 
Clean up following functions:
dfs_mark_precac_done
dfs_unmark_precac_nol/utils_dfs_unmark_precac_nol
dfs_mlme_start_csa/mlme_start_csa
dfs_mlme_get_extchan/mlme_get_extchan
dfs_fill_chan_info
utils_dfs_get_channel_list
dfs_clear_nolhistory
dfs_getchanstate
dfs_radar_enable
os_timer_func
dfs_cac_timeout

Change-Id: Id0775ba34b6f1f6c7fedaea9711d81ca07956c70
CRs-Fixed: 2946423
This commit is contained in:
Jianmin Zhu
2021-05-15 20:34:54 +08:00
committad av Madan Koyyalamudi
förälder 2ea97ac985
incheckning ef56741282
10 ändrade filer med 3 tillägg och 670 borttagningar
Download Patch File Download Diff File Expand all files Collapse all files

37
umac/dfs/dispatcher/inc/wlan_dfs_mlme_api.h
Visa fil

@@ -65,22 +65,6 @@ dfs_mlme_proc_spoof_success(struct wlan_objmgr_pdev *pdev)
}
#endif
/**
* dfs_mlme_start_csa() - Sends CSA in ieeeChan
* @pdev: Pointer to DFS pdev object.
* @ieee_chan: Channel number.
* @freq: Channel frequency.
* @cfreq2: HT80 cfreq2.
* @flags: channel flags.
*/
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,
uint8_t ieee_chan,
uint16_t freq,
uint8_t cfreq2,
uint64_t flags);
#endif
/**
* dfs_mlme_start_csa_for_freq() - Sends CSA in ieeeChan
* @pdev: Pointer to DFS pdev object.
@@ -117,27 +101,6 @@ void dfs_mlme_deliver_event_up_after_cac(struct wlan_objmgr_pdev *pdev);
*/
void dfs_mlme_get_dfs_ch_nchans(struct wlan_objmgr_pdev *pdev, int *nchans);
/**
* dfs_mlme_get_extchan() - Get extension channel.
* @pdev: Pointer to DFS pdev object.
* @dfs_ch_freq: Frequency in Mhz.
* @dfs_ch_flags: Channel flags.
* @dfs_ch_flagext: Extended channel flags.
* @dfs_ch_ieee: IEEE channel number.
* @dfs_ch_vhtop_ch_freq_seg1: Channel Center frequency.
* @dfs_ch_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* mode of operation.
*/
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS dfs_mlme_get_extchan(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_ch_freq,
uint64_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2);
#endif
/**
* dfs_mlme_get_extchan() - Get extension channel.
* @pdev: Pointer to DFS pdev object.

16
umac/dfs/dispatcher/inc/wlan_dfs_ucfg_api.h
Visa fil

@@ -36,13 +36,11 @@
* @pdev_component_obj_detach: Detach DFS object from PDEV.
* @pdev_get_comp_private_obj: Get DFS object from PDEV.
* @dfs_start_rcsa: Send RCSA to RootAP.
* @mlme_start_csa: Sends CSA.
* @mlme_proc_cac: Process the CAC completion event.
* @mlme_deliver_event_up_after_cac: Send a CAC timeout, VAP up event to user
* space
* @mlme_get_dfs_ch_nchans: Get number of channels in the channel
* list.
* @mlme_get_extchan: Gets the extension channel.
* @mlme_set_no_chans_available: Sets no_chans_available flag.
* @mlme_ieee2mhz: Gets Channel freq from ieee number.
* @mlme_find_dot11_channel: Find dot11 channel.
@@ -95,11 +93,6 @@ struct dfs_to_mlme {
uint16_t freq,
uint16_t vhtop_ch_freq_seg2,
uint64_t flags);
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS (*mlme_start_csa)(struct wlan_objmgr_pdev *pdev,
uint8_t ieee_chan, uint16_t freq,
uint8_t cfreq2, uint64_t flags);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS (*mlme_start_csa_for_freq)(struct wlan_objmgr_pdev *pdev,
uint8_t ieee_chan, uint16_t freq,
@@ -111,15 +104,6 @@ struct dfs_to_mlme {
struct wlan_objmgr_pdev *pdev);
QDF_STATUS (*mlme_get_dfs_ch_nchans)(struct wlan_objmgr_pdev *pdev,
int *nchans);
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS (*mlme_get_extchan)(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_ch_freq,
uint64_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS (*mlme_get_extchan_for_freq)(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_ch_freq,

11
umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h
Visa fil

@@ -140,17 +140,6 @@ bool utils_dfs_is_freq_in_nol(struct wlan_objmgr_pdev *pdev, uint32_t freq);
*/
QDF_STATUS utils_dfs_reset_precaclists(struct wlan_objmgr_pdev *pdev);
/**
* utils_dfs_unmark_precac_nol() - Clears precac channel marked as NOL.
* @pdev: Pointer to DFS pdev object.
* @chan: channel to be unmarked as NOL.
*
* Return void.
*/
#ifdef CONFIG_CHAN_NUM_API
void utils_dfs_unmark_precac_nol(struct wlan_objmgr_pdev *pdev, uint8_t chan);
#endif
/**
* utils_dfs_unmark_precac_nol_for_freq() - Clears precac channel marked as NOL.
* @pdev: Pointer to DFS pdev object.

52
umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c
Visa fil

@@ -103,16 +103,6 @@ void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
#endif
#ifndef QCA_MCL_DFS_SUPPORT
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,
uint8_t ieee_chan, uint16_t freq,
uint8_t cfreq2, uint64_t flags)
{
if (global_dfs_to_mlme.mlme_start_csa)
global_dfs_to_mlme.mlme_start_csa(pdev, ieee_chan, freq, cfreq2,
flags);
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
void dfs_mlme_start_csa_for_freq(struct wlan_objmgr_pdev *pdev,
uint8_t ieee_chan, uint16_t freq,
@@ -124,26 +114,6 @@ void dfs_mlme_start_csa_for_freq(struct wlan_objmgr_pdev *pdev,
}
#endif
#else
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,
uint8_t ieee_chan, uint16_t freq,
uint8_t cfreq2, uint64_t flags)
{
struct wlan_objmgr_vdev *vdev;
if (!pdev) {
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "null pdev");
return;
}
vdev = wlan_pdev_peek_active_first_vdev(pdev, WLAN_DFS_ID);
if (vdev) {
dfs_send_radar_ind(pdev, vdev, NULL);
wlan_objmgr_vdev_release_ref(vdev, WLAN_DFS_ID);
}
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
void dfs_mlme_start_csa_for_freq(struct wlan_objmgr_pdev *pdev,
uint8_t ieee_chan, uint16_t freq,
@@ -203,28 +173,6 @@ void dfs_mlme_get_dfs_ch_nchans(struct wlan_objmgr_pdev *pdev,
nchans);
}
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS dfs_mlme_get_extchan(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_ch_freq,
uint64_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2)
{
if (global_dfs_to_mlme.mlme_get_extchan)
return global_dfs_to_mlme.mlme_get_extchan(pdev,
dfs_ch_freq,
dfs_ch_flags,
dfs_ch_flagext,
dfs_ch_ieee,
dfs_ch_vhtop_ch_freq_seg1,
dfs_ch_vhtop_ch_freq_seg2);
return QDF_STATUS_E_FAILURE;
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS dfs_mlme_get_extchan_for_freq(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_chan_freq,

95
umac/dfs/dispatcher/src/wlan_dfs_utils_api.c
Visa fil

@@ -104,21 +104,6 @@ QDF_STATUS utils_dfs_reset_precaclists(struct wlan_objmgr_pdev *pdev)
}
qdf_export_symbol(utils_dfs_reset_precaclists);
#ifdef CONFIG_CHAN_NUM_API
void utils_dfs_unmark_precac_nol(struct wlan_objmgr_pdev *pdev, uint8_t chan)
{
struct wlan_dfs *dfs;
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs)
return;
dfs_unmark_precac_nol(dfs, chan);
}
qdf_export_symbol(utils_dfs_unmark_precac_nol);
#endif
#ifdef CONFIG_CHAN_FREQ_API
void utils_dfs_unmark_precac_nol_for_freq(struct wlan_objmgr_pdev *pdev,
uint16_t chan_freq)
@@ -284,19 +269,6 @@ static void dfs_fill_chan_info(struct dfs_channel *chan,
chan->dfs_ch_mhz_freq_seg1 = wlan_chan->ch_cfreq1;
chan->dfs_ch_mhz_freq_seg2 = wlan_chan->ch_cfreq2;
}
#else
#ifdef CONFIG_CHAN_NUM_API
static void dfs_fill_chan_info(struct dfs_channel *chan,
struct wlan_channel *wlan_chan)
{
chan->dfs_ch_freq = wlan_chan->ch_freq;
chan->dfs_ch_flags = wlan_chan->ch_flags;
chan->dfs_ch_flagext = wlan_chan->ch_flagext;
chan->dfs_ch_ieee = wlan_chan->ch_ieee;
chan->dfs_ch_vhtop_ch_freq_seg1 = wlan_chan->ch_freq_seg1;
chan->dfs_ch_vhtop_ch_freq_seg2 = wlan_chan->ch_freq_seg2;
}
#endif
#endif
bool utils_dfs_is_precac_done(struct wlan_objmgr_pdev *pdev,
@@ -786,74 +758,7 @@ static void utils_dfs_get_channel_list(struct wlan_objmgr_pdev *pdev,
qdf_mem_free(tmp_chan_list);
}
#else /* NUM_API */
#ifdef CONFIG_CHAN_NUM_API
static void utils_dfs_get_channel_list(struct wlan_objmgr_pdev *pdev,
struct wlan_objmgr_vdev *vdev,
struct dfs_channel *chan_list,
uint32_t *num_chan)
{
struct dfs_channel *tmp_chan_list = NULL;
struct wlan_dfs *dfs;
bool is_curchan_5g;
bool is_curchan_24g;
bool is_curchan_49g;
uint32_t chan_num;
uint32_t center_freq;
uint16_t flagext;
int i, j = 0;
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs");
return;
}
tmp_chan_list = qdf_mem_malloc(*num_chan * sizeof(*tmp_chan_list));
if (!tmp_chan_list)
return;
utils_dfs_get_chan_list(pdev, (void *)tmp_chan_list, num_chan);
chan_num = dfs->dfs_curchan->dfs_ch_ieee;
center_freq = dfs->dfs_curchan->dfs_ch_freq;
is_curchan_5g = WLAN_REG_IS_5GHZ_CH_FREQ(center_freq);
is_curchan_24g = WLAN_REG_IS_24GHZ_CH_FREQ(center_freq);
is_curchan_49g = WLAN_REG_IS_49GHZ_FREQ(center_freq);
for (i = 0; i < *num_chan; i++) {
chan_num = tmp_chan_list[i].dfs_ch_ieee;
center_freq = tmp_chan_list[i].dfs_ch_freq;
flagext = tmp_chan_list[i].dfs_ch_flagext;
if (!dfs_mlme_check_allowed_prim_chanlist(pdev, chan_num))
continue;
if ((is_curchan_5g) && WLAN_REG_IS_5GHZ_CH_FREQ(center_freq)) {
chan_list[j].dfs_ch_ieee = chan_num;
chan_list[j].dfs_ch_freq = center_freq;
chan_list[j].dfs_ch_flagext = flagext;
j++;
} else if ((is_curchan_24g) &&
WLAN_REG_IS_24GHZ_CH_FREQ(center_freq)) {
chan_list[j].dfs_ch_ieee = chan_num;
chan_list[j].dfs_ch_freq = center_freq;
j++;
} else if ((is_curchan_49g) &&
WLAN_REG_IS_49GHZ_FREQ(center_freq)) {
chan_list[j].dfs_ch_ieee = chan_num;
chan_list[j].dfs_ch_freq = center_freq;
j++;
}
}
*num_chan = j;
qdf_mem_free(tmp_chan_list);
}
#endif
#endif
#else
void utils_dfs_get_nol_history_chan_list(struct wlan_objmgr_pdev *pdev,
void *clist, uint32_t *num_chan)