samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Derivar 0
Código Questões Pedidos de integração Operações Pacotes Planeamentos Lançamentos Wiki Trabalho

qcacmn: Cleanup code under CONFIG_CHAN_NUM_API feature flag

Ver a proveniência 
As part of regulatory cleanup, Cleanup code under
CONFIG_CHAN_NUM_API feature flag.

Change-Id: I3add81605ea939b3631396154ed3f07f59493f24
CRs-Fixed: 2953646
Este cometimento está contido em:
Ashish Kumar Dhanotiya
2021-04-26 13:28:16 +05:30
cometido por Madan Koyyalamudi
ascendente 8b5f8ef911
cometimento 433c6f024a
26 ficheiros modificados com 14 adições e 2167 eliminações
Descarregar ficheiro patch Descarregar ficheiro diff Expandir todos os ficheiros Colapsar todos os ficheiros

70
umac/dfs/dispatcher/inc/wlan_dfs_mlme_api.h
Ver ficheiro

@@ -139,38 +139,6 @@ int dfs_mlme_ieee2mhz(struct wlan_objmgr_pdev *pdev,
int ieee,
uint64_t flag);
/**
* dfs_mlme_find_dot11_channel() - Get dot11 channel from ieee, cfreq2 and mode.
* @pdev: Pointer to DFS pdev object.
* @ieee: Channel number.
* @des_cfreq2: cfreq2
* @mode: Phymode
* @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.
*
* Return:
* * QDF_STATUS_SUCCESS : Channel found.
* * QDF_STATUS_E_FAILURE: Channel not found.
*/
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS
dfs_mlme_find_dot11_channel(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint8_t des_cfreq2,
int mode,
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_find_dot11_chan_for_freq() - Find a channel pointer given the mode,
* frequency and channel flags.
@@ -210,29 +178,6 @@ dfs_mlme_find_dot11_chan_for_freq(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_chan_mhz_freq_seg2);
#endif
/**
* dfs_mlme_get_dfs_ch_channels() - Get channel from channel list.
* @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.
* @index: Index into channel list.
*/
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_get_dfs_ch_channels(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,
int index);
#endif
/**
* dfs_mlme_get_dfs_channels_for_freq() - Get DFS channel from channel list.
* @pdev: Pointer to DFS pdev object.
@@ -290,21 +235,6 @@ void dfs_mlme_clist_update(struct wlan_objmgr_pdev *pdev,
void *nollist,
int nentries);
/**
* dfs_mlme_get_cac_timeout() - Get cac_timeout.
* @pdev: Pointer to DFS pdev object.
* @dfs_ch_freq: Frequency in Mhz.
* @dfs_ch_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* mode of operation.
* @dfs_ch_flags: Channel flags.
*/
#ifdef CONFIG_CHAN_NUM_API
int dfs_mlme_get_cac_timeout(struct wlan_objmgr_pdev *pdev,
uint16_t dfs_ch_freq,
uint8_t dfs_ch_vhtop_ch_freq_seg2,
uint64_t dfs_ch_flags);
#endif
/**
* dfs_mlme_get_cac_timeout_for_freq() - Get cac_timeout.
* @pdev: Pointer to DFS pdev object.

59
umac/dfs/dispatcher/inc/wlan_dfs_tgt_api.h
Ver ficheiro

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
*
*
* Permission to use, copy, modify, and/or distribute this software for
@@ -120,28 +120,7 @@ struct vdev_adfs_complete_status {
extern struct dfs_to_mlme global_dfs_to_mlme;
/**
* tgt_dfs_set_current_channel() - Fill dfs channel structure from
* dfs_channel structure.
* @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 frequency1.
* @dfs_ch_vhtop_ch_freq_seg2: Channel Center frequency2.
*/
#ifdef DFS_COMPONENT_ENABLE
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS tgt_dfs_set_current_channel(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
/**
* tgt_dfs_set_current_channel_for_freq() - Fill dfs channel structure from
* dfs_channel structure.
@@ -222,17 +201,6 @@ QDF_STATUS tgt_dfs_get_radars(struct wlan_objmgr_pdev *pdev);
QDF_STATUS tgt_dfs_process_radar_ind(struct wlan_objmgr_pdev *pdev,
struct radar_found_info *radar_found);
#else
static inline QDF_STATUS tgt_dfs_set_current_channel(
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)
{
return QDF_STATUS_SUCCESS;
}
static inline QDF_STATUS tgt_dfs_radar_enable(
struct wlan_objmgr_pdev *pdev,
@@ -377,31 +345,6 @@ QDF_STATUS tgt_dfs_agile_precac_start(struct wlan_objmgr_pdev *pdev);
QDF_STATUS tgt_dfs_ocac_complete(struct wlan_objmgr_pdev *pdev,
struct vdev_adfs_complete_status *ocac_status);
/**
* utils_dfs_find_vht80_chan_for_precac() - Find VHT80 channel for precac.
* @pdev: Pointer to DFS pdev object.
* @chan_mode: Channel mode.
* @ch_freq_seg1: Segment1 channel freq.
* @cfreq1: cfreq1.
* @cfreq2: cfreq2.
* @phy_mode: Precac phymode.
* @dfs_set_cfreq2: Precac cfreq2
* @set_agile: Agile mode flag.
*
* wrapper function for dfs_find_vht80_chan_for_precacdfs_cancel_cac_timer().
* This function called from outside of dfs component.
*/
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS tgt_dfs_find_vht80_chan_for_precac(struct wlan_objmgr_pdev *pdev,
uint32_t chan_mode,
uint8_t ch_freq_seg1,
uint32_t *cfreq1,
uint32_t *cfreq2,
uint32_t *phy_mode,
bool *dfs_set_cfreq2,
bool *set_agile);
#endif
/**
* tgt_dfs_find_vht80_precac_chan_freq() - Find VHT80 channel for precac
* @pdev: Pointer to DFS pdev object.

58
umac/dfs/dispatcher/inc/wlan_dfs_ucfg_api.h
Ver ficheiro

@@ -41,16 +41,11 @@
* space
* @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.
* @mlme_get_dfs_ch_channels: Get the channel list.
* @mlme_dfs_ch_flags_ext: Gets channel extension flag.
* @mlme_channel_change_by_precac: Channel change triggered by PreCAC.
* @mlme_precac_chan_change_csa: Channel change triggered by PrCAC using
* Channel Switch Announcement.
* @mlme_nol_timeout_notification: NOL timeout notification.
* @mlme_clist_update: Updates the channel list.
* @mlme_is_opmode_sta: Check if pdev opmode is STA.
* @mlme_get_cac_timeout: Gets the CAC timeout.
* @mlme_rebuild_chan_list_with_non_dfs_channel: Rebuild channels with non-dfs
* channels.
* @mlme_restart_vaps_with_non_dfs_chan: Restart vaps with non-dfs channel.
@@ -117,18 +112,6 @@ struct dfs_to_mlme {
int ieee,
uint64_t flag,
int *freq);
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS (*mlme_find_dot11_channel)(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint8_t des_cfreq2,
int mode,
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_find_dot11_chan_for_freq)(struct wlan_objmgr_pdev *,
uint16_t freq,
@@ -143,16 +126,6 @@ struct dfs_to_mlme {
uint16_t *dfs_cfreq1_mhz,
uint16_t *dfs_cfreq2_mhz);
#endif
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS (*mlme_get_dfs_ch_channels)(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,
int index);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS (*mlme_get_dfs_channels_for_freq)(
struct wlan_objmgr_pdev *pdev,
@@ -178,12 +151,6 @@ struct dfs_to_mlme {
uint16_t des_cfreq2,
enum wlan_phymode des_mode);
#endif
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS
(*mlme_precac_chan_change_csa)(struct wlan_objmgr_pdev *,
uint8_t des_chan,
enum wlan_phymode des_mode);
#endif
#endif
#ifdef QCA_SUPPORT_DFS_CHAN_POSTNOL
QDF_STATUS
@@ -198,13 +165,6 @@ struct dfs_to_mlme {
void *nollist,
int nentries);
bool (*mlme_is_opmode_sta)(struct wlan_objmgr_pdev *pdev);
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS (*mlme_get_cac_timeout)(struct wlan_objmgr_pdev *pdev,
uint16_t dfs_ch_freq,
uint8_t c_vhtop_ch_freq_seg2,
uint64_t dfs_ch_flags,
int *cac_timeout);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS
(*mlme_get_cac_timeout_for_freq)(struct wlan_objmgr_pdev *pdev,
@@ -387,22 +347,6 @@ QDF_STATUS ucfg_dfs_set_precac_intermediate_chan(struct wlan_objmgr_pdev *pdev,
QDF_STATUS ucfg_dfs_get_precac_intermediate_chan(struct wlan_objmgr_pdev *pdev,
int *buff);
/**
* ucfg_dfs_get_precac_chan_state() - Get precac status for the given channel.
* @pdev: Pointer to DFS pdev object.
* @precac_chan: Channel number for which precac state needs to be determined.
*
* Wrapper function for dfs_get_precac_chan_state().
* This function called from outside of dfs component.
*
* Return: Precac state of the given channel.
*/
#ifdef CONFIG_CHAN_NUM_API
enum precac_chan_state
ucfg_dfs_get_precac_chan_state(struct wlan_objmgr_pdev *pdev,
uint8_t precac_chan);
#endif
/**
* ucfg_dfs_get_precac_chan_state_for_freq() - Get precac status for the
* given channel.
@@ -410,7 +354,7 @@ ucfg_dfs_get_precac_chan_state(struct wlan_objmgr_pdev *pdev,
* @precac_chan: Channel frequency for which precac state needs to be
* determined.
*
* Wrapper function for dfs_get_precac_chan_state().
* Wrapper function for dfs_get_precac_chan_state_for_freq().
* This function called from outside of dfs component.
*
* Return: Precac state of the given channel.

70
umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h
Ver ficheiro

@@ -84,21 +84,6 @@
extern struct dfs_to_mlme global_dfs_to_mlme;
/**
* utils_dfs_cac_valid_reset() - Cancels the dfs_cac_valid_timer timer.
* @pdev: Pointer to DFS pdev object.
* @prevchan_ieee: Prevchan number.
* @prevchan_flags: Prevchan flags.
*
* Wrapper function for dfs_cac_valid_reset(). This function called from
* outside of DFS component.
*/
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS utils_dfs_cac_valid_reset(struct wlan_objmgr_pdev *pdev,
uint8_t prevchan_ieee,
uint32_t prevchan_flags);
#endif
/**
* utils_dfs_cac_valid_reset_for_freq() - Cancels the dfs_cac_valid_timer timer.
* @pdev: Pointer to DFS pdev object.
@@ -176,30 +161,12 @@ QDF_STATUS utils_dfs_start_precac_timer(struct wlan_objmgr_pdev *pdev);
#ifdef WLAN_DFS_PRECAC_AUTO_CHAN_SUPPORT
/**
* utils_dfs_precac_decide_pref_chan() - Choose preferred channel
* @pdev: Pointer to DFS pdev object.
* @ch_ieee: Pointer to channel number.
* @mode: Configured PHY mode.
*
* Wrapper function for dfs_decide_precac_preferred_chan(). This
* function called from outside of dfs component.
*
* Return: True if intermediate channel needs to configure. False otherwise.
*/
#ifdef CONFIG_CHAN_NUM_API
bool
utils_dfs_precac_decide_pref_chan(struct wlan_objmgr_pdev *pdev,
uint8_t *ch_ieee,
enum wlan_phymode mode);
#endif
/**
* utils_dfs_precac_decide_pref_chan() - Choose preferred channel
* utils_dfs_precac_decide_pref_chan_for_freq() - Choose preferred channel
* @pdev: Pointer to DFS pdev object.
* @ch_freq: Pointer to channel frequency.
* @mode: Configured PHY mode.
*
* Wrapper function for dfs_decide_precac_preferred_chan(). This
* Wrapper function for dfs_decide_precac_preferred_chan_for_freq(). This
* function called from outside of dfs component.
*
* Return: True if intermediate channel needs to configure. False otherwise.
@@ -581,23 +548,6 @@ static inline bool utils_is_dfs_chan_for_freq(struct wlan_objmgr_pdev *pdev,
*/
bool utils_is_dfs_cfreq2_ch(struct wlan_objmgr_pdev *pdev);
/**
* utils_dfs_reg_update_nol_ch() - set nol channel
*
* @pdev: pdev ptr
* @ch_list: channel list to be returned
* @num_ch: number of channels
* @nol_ch: nol flag
*
* Return: void
*/
#ifdef CONFIG_CHAN_NUM_API
void utils_dfs_reg_update_nol_ch(struct wlan_objmgr_pdev *pdev,
uint8_t *ch_list,
uint8_t num_ch,
bool nol_ch);
#endif
/**
* utils_dfs_reg_update_nol_chan_for_freq() - set nol channel
*
@@ -800,22 +750,6 @@ void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
*/
void utils_dfs_get_nol_history_chan_list(struct wlan_objmgr_pdev *pdev,
void *clist, uint32_t *num_chan);
/**
* utils_dfs_reg_update_nol_history_ch() - set nol history channel
*
* @pdev: pdev ptr
* @ch_list: channel list to be returned
* @num_ch: number of channels
* @nol_history_ch: nol history flag
*
* Return: void
*/
#ifdef CONFIG_CHAN_NUM_API
void utils_dfs_reg_update_nol_history_ch(struct wlan_objmgr_pdev *pdev,
uint8_t *ch_list,
uint8_t num_ch,
bool nol_history_ch);
#endif
/**
* utils_dfs_reg_update_nol_history_chan_for_freq() - set nol history channel

68
umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c
Ver ficheiro

@@ -213,34 +213,6 @@ int dfs_mlme_ieee2mhz(struct wlan_objmgr_pdev *pdev, int ieee, uint64_t flag)
return freq;
}
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS
dfs_mlme_find_dot11_channel(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint8_t des_cfreq2,
int mode,
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_find_dot11_channel)
return global_dfs_to_mlme.mlme_find_dot11_channel(pdev,
ieee,
des_cfreq2,
mode,
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_find_dot11_chan_for_freq(struct wlan_objmgr_pdev *pdev,
@@ -273,27 +245,6 @@ dfs_mlme_find_dot11_chan_for_freq(struct wlan_objmgr_pdev *pdev,
}
#endif
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_get_dfs_ch_channels(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,
int index)
{
if (global_dfs_to_mlme.mlme_get_dfs_ch_channels)
global_dfs_to_mlme.mlme_get_dfs_ch_channels(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,
index);
}
#endif
uint32_t dfs_mlme_dfs_ch_flags_ext(struct wlan_objmgr_pdev *pdev)
{
@@ -330,25 +281,6 @@ void dfs_mlme_clist_update(struct wlan_objmgr_pdev *pdev,
nentries);
}
#ifdef CONFIG_CHAN_NUM_API
int dfs_mlme_get_cac_timeout(struct wlan_objmgr_pdev *pdev,
uint16_t dfs_ch_freq,
uint8_t dfs_ch_vhtop_ch_freq_seg2,
uint64_t dfs_ch_flags)
{
int cac_timeout = 0;
if (global_dfs_to_mlme.mlme_get_cac_timeout)
global_dfs_to_mlme.mlme_get_cac_timeout(pdev,
dfs_ch_freq,
dfs_ch_vhtop_ch_freq_seg2,
dfs_ch_flags,
&cac_timeout);
return cac_timeout;
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
int dfs_mlme_get_cac_timeout_for_freq(struct wlan_objmgr_pdev *pdev,
uint16_t dfs_chan_freq,

110
umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c
Ver ficheiro

@@ -81,39 +81,6 @@ bool tgt_dfs_is_pdev_5ghz(struct wlan_objmgr_pdev *pdev)
return is_5ghz;
}
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS tgt_dfs_set_current_channel(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)
{
struct wlan_dfs *dfs;
if (!tgt_dfs_is_pdev_5ghz(pdev))
return QDF_STATUS_SUCCESS;
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
dfs_set_current_channel(dfs,
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_SUCCESS;
}
qdf_export_symbol(tgt_dfs_set_current_channel);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS
tgt_dfs_set_current_channel_for_freq(struct wlan_objmgr_pdev *pdev,
@@ -483,51 +450,6 @@ QDF_STATUS tgt_dfs_set_agile_precac_state(struct wlan_objmgr_pdev *pdev,
return QDF_STATUS_SUCCESS;
}
#else
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS tgt_dfs_set_agile_precac_state(struct wlan_objmgr_pdev *pdev,
int agile_precac_state)
{
struct wlan_dfs *dfs;
struct dfs_soc_priv_obj *dfs_soc;
bool is_precac_running_on_given_pdev = false;
int i;
if (!tgt_dfs_is_pdev_5ghz(pdev))
return QDF_STATUS_SUCCESS;
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
dfs_soc = dfs->dfs_soc_obj;
for (i = 0; i < dfs_soc->num_dfs_privs; i++) {
if (dfs_soc->dfs_priv[i].dfs == dfs) {
/* Set the pdev state to given value. */
dfs_soc->dfs_priv[i].agile_precac_active =
agile_precac_state;
/* If the pdev state is changed to inactive,
* reset the agile channel.
*/
if (!agile_precac_state)
dfs->dfs_agile_precac_freq = 0;
if (dfs_soc->cur_agile_dfs_index == i)
is_precac_running_on_given_pdev = true;
}
}
/* If preCAC is running on this pdev and the agile_precac_state
* is set to false, set the global state in dfs_soc_obj to false.
* If this global state is not set to false, then preCAC will not be
* started the next time this pdev becomes active.
*/
if (is_precac_running_on_given_pdev && !agile_precac_state)
dfs_soc->precac_state_started = PRECAC_NOT_STARTED;
return QDF_STATUS_SUCCESS;
}
#endif
#endif
#else
@@ -573,38 +495,6 @@ QDF_STATUS tgt_dfs_ocac_complete(struct wlan_objmgr_pdev *pdev,
#endif
qdf_export_symbol(tgt_dfs_ocac_complete);
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS tgt_dfs_find_vht80_chan_for_precac(struct wlan_objmgr_pdev *pdev,
uint32_t chan_mode,
uint8_t ch_freq_seg1,
uint32_t *cfreq1,
uint32_t *cfreq2,
uint32_t *phy_mode,
bool *dfs_set_cfreq2,
bool *set_agile)
{
struct wlan_dfs *dfs;
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
dfs_find_vht80_chan_for_precac(dfs,
chan_mode,
ch_freq_seg1,
cfreq1,
cfreq2,
phy_mode,
dfs_set_cfreq2,
set_agile);
return QDF_STATUS_SUCCESS;
}
qdf_export_symbol(tgt_dfs_find_vht80_chan_for_precac);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS
tgt_dfs_find_vht80_precac_chan_freq(struct wlan_objmgr_pdev *pdev,

24
umac/dfs/dispatcher/src/wlan_dfs_ucfg_api.c
Ver ficheiro

@@ -250,30 +250,6 @@ QDF_STATUS ucfg_dfs_get_precac_intermediate_chan(struct wlan_objmgr_pdev *pdev,
return QDF_STATUS_SUCCESS;
}
#ifdef CONFIG_CHAN_NUM_API
enum precac_chan_state
ucfg_dfs_get_precac_chan_state(struct wlan_objmgr_pdev *pdev,
uint8_t precac_chan)
{
struct wlan_dfs *dfs;
enum precac_chan_state retval = PRECAC_ERR;
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs");
return PRECAC_ERR;
}
retval = dfs_get_precac_chan_state(dfs, precac_chan);
if (retval == PRECAC_ERR) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS,
"Could not find precac channel state");
}
return retval;
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
enum precac_chan_state
ucfg_dfs_get_precac_chan_state_for_freq(struct wlan_objmgr_pdev *pdev,

57
umac/dfs/dispatcher/src/wlan_dfs_utils_api.c
Ver ficheiro

@@ -153,44 +153,9 @@ QDF_STATUS utils_dfs_start_precac_timer(struct wlan_objmgr_pdev *pdev)
return QDF_STATUS_SUCCESS;
}
#else
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS utils_dfs_start_precac_timer(struct wlan_objmgr_pdev *pdev)
{
struct wlan_dfs *dfs;
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "NULL dfs");
return QDF_STATUS_E_FAILURE;
}
if (!dfs->dfs_precac_secondary_freq)
return QDF_STATUS_E_FAILURE;
dfs_start_precac_timer(dfs,
dfs->dfs_precac_secondary_freq);
return QDF_STATUS_SUCCESS;
}
#endif
#endif
#ifdef WLAN_DFS_PRECAC_AUTO_CHAN_SUPPORT
#ifdef CONFIG_CHAN_NUM_API
bool
utils_dfs_precac_decide_pref_chan(struct wlan_objmgr_pdev *pdev,
uint8_t *ch_ieee,
enum wlan_phymode mode)
{
struct wlan_dfs *dfs;
dfs = wlan_pdev_get_dfs_obj(pdev);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "NULL dfs");
return false;
}
return dfs_decide_precac_preferred_chan(dfs, ch_ieee, mode);
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
bool
utils_dfs_precac_decide_pref_chan_for_freq(struct wlan_objmgr_pdev *pdev,
@@ -1118,18 +1083,6 @@ void utils_dfs_clear_nol_channels(struct wlan_objmgr_pdev *pdev)
}
qdf_export_symbol(utils_dfs_clear_nol_channels);
#ifdef CONFIG_CHAN_NUM_API
void utils_dfs_reg_update_nol_ch(struct wlan_objmgr_pdev *pdev,
uint8_t *ch_list,
uint8_t num_ch,
bool nol_ch)
{
/* TODO : Need locking?*/
wlan_reg_update_nol_ch(pdev, ch_list, num_ch, nol_ch);
}
qdf_export_symbol(utils_dfs_reg_update_nol_ch);
#endif
#ifdef CONFIG_CHAN_FREQ_API
void utils_dfs_reg_update_nol_chan_for_freq(struct wlan_objmgr_pdev *pdev,
uint16_t *freq_list,
@@ -1142,16 +1095,6 @@ void utils_dfs_reg_update_nol_chan_for_freq(struct wlan_objmgr_pdev *pdev,
qdf_export_symbol(utils_dfs_reg_update_nol_chan_for_freq);
#endif
#ifdef CONFIG_CHAN_NUM_API
void utils_dfs_reg_update_nol_history_ch(struct wlan_objmgr_pdev *pdev,
uint8_t *ch_list,
uint8_t num_ch,
bool nol_history_ch)
{
wlan_reg_update_nol_history_ch(pdev, ch_list, num_ch, nol_history_ch);
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
void
utils_dfs_reg_update_nol_history_chan_for_freq(struct wlan_objmgr_pdev *pdev,