qcacld-3.0: Clean up code under PRE_CAC_COMP flag

pre cac componentization is done, so clean up
code under PRE_CAC_COMP flag.

Change-Id: I6465bce9fc883797f42358aaeb8dabf70e449cde
CRs-Fixed: 3232820
This commit is contained in:
Dundi Raviteja
2022-06-28 12:58:39 +05:30
committed by Madan Koyyalamudi
parent f327e23c86
commit a258f3cd42
13 changed files with 16 additions and 1015 deletions

View File

@@ -161,15 +161,7 @@ typedef enum {
eSAP_DFS_CAC_START,
eSAP_DFS_CAC_INTERRUPTED,
eSAP_DFS_CAC_END,
/*
* Code under PRE_CAC_COMP will be cleaned up
* once pre cac component is done
*/
#ifndef PRE_CAC_COMP
eSAP_DFS_PRE_CAC_END,
#endif
eSAP_DFS_RADAR_DETECT,
eSAP_DFS_RADAR_DETECT_DURING_PRE_CAC,
/* No ch available after DFS RADAR detect */
eSAP_DFS_NO_AVAILABLE_CHANNEL,
eSAP_STOP_BSS_DUE_TO_NO_CHNL,
@@ -861,107 +853,6 @@ QDF_STATUS wlan_sap_update_next_channel(struct sap_context *sap_ctx,
uint8_t channel,
enum phy_ch_width chan_bw);
/*
* Code under PRE_CAC_COMP will be cleaned up
* once pre cac component is done
*/
#ifndef PRE_CAC_COMP
#if defined(FEATURE_SAP_COND_CHAN_SWITCH) && defined(PRE_CAC_SUPPORT)
/**
* wlan_sap_set_pre_cac_status() - Set the pre cac status
* @sap_ctx: SAP context
* @status: Status of pre cac
*
* Updates the state of pre cac in the SAP context
*
* Return: QDF_STATUS
*/
QDF_STATUS wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx,
bool status);
/**
* wlan_sap_set_chan_freq_before_pre_cac() - Save the channel before pre cac
* @sap_ctx: SAP context
* @freq_before_pre_cac: Channel frequency before pre cac
*
* Saves the channel frequency that was in use before pre cac operation
*
* Return: QDF_STATUS
*/
QDF_STATUS
wlan_sap_set_chan_freq_before_pre_cac(struct sap_context *sap_ctx,
qdf_freq_t freq_before_pre_cac);
#else
static inline QDF_STATUS
wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx, bool status)
{
return QDF_STATUS_SUCCESS;
}
static inline QDF_STATUS
wlan_sap_set_chan_freq_before_pre_cac(struct sap_context *sap_ctx,
qdf_freq_t freq_before_pre_cac)
{
return QDF_STATUS_SUCCESS;
}
#endif /* FEATURE_SAP_COND_CHAN_SWITCH and PRE_CAC_SUPPORT */
#endif /* PRE_CAC_COMP */
#ifdef PRE_CAC_SUPPORT
/*
* Code under PRE_CAC_COMP will be cleaned up
* once pre cac component is done
*/
#ifndef PRE_CAC_COMP
/**
* wlan_sap_set_pre_cac_complete_status() - Sets pre cac complete status
* @sap_ctx: SAP context
* @status: Status of pre cac complete
*
* Sets the status of pre cac i.e., whether pre cac is complete or not
*
* Return: QDF_STATUS
*/
QDF_STATUS wlan_sap_set_pre_cac_complete_status(struct sap_context *sap_ctx,
bool status);
/**
* wlan_sap_is_pre_cac_context() - checks if @context is for a pre-cac adapter
* @context: the SAP context to check
*
* Return: true if @context is for a pre-cac adapter
*/
bool wlan_sap_is_pre_cac_context(struct sap_context *context);
bool wlan_sap_is_pre_cac_active(mac_handle_t handle);
QDF_STATUS wlan_sap_get_pre_cac_vdev_id(mac_handle_t handle, uint8_t *vdev_id);
#endif
#else
/*
* Code under PRE_CAC_COMP will be cleaned up
* once pre cac component is done
*/
#ifndef PRE_CAC_COMP
static inline QDF_STATUS
wlan_sap_set_pre_cac_complete_status(struct sap_context *sap_ctx,
bool status)
{
return QDF_STATUS_SUCCESS;
}
static inline bool
wlan_sap_is_pre_cac_context(struct sap_context *context)
{
return false;
}
static inline bool wlan_sap_is_pre_cac_active(mac_handle_t handle)
{
return false;
}
#endif /* PRE_CAC_COMP */
#endif /* PRE_CAC_SUPPORT */
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
/**
* wlansap_check_cc_intf() - Get interfering concurrent channel