qcacmn: Rectify compilation error when CONFIG_BAND_6GHZ is disabled

When CONFIG_BAND_6GHZ is disabled, compilation error is observed
due to the absence of the declaration of reg_convert_enum_to_6g_idx
and reg_get_reg_maschan_lst_frm_6g_pwr_mode.

To fix this issue, add static declarations for
reg_convert_enum_to_6g_idx and reg_get_reg_maschan_lst_frm_6g_pwr_mode
when CONFIG_BAND_6GHZ is disabled.

Change-Id: I616de6cd2630be1897da6cd87a29569e51bf058e
CRs-Fixed: 3131119
This commit is contained in:
Hariharan Basuthkar
2022-02-15 23:23:12 +05:30
committed by Madan Koyyalamudi
父節點 a2f8cef72d
當前提交 9ae0959d63
共有 2 個文件被更改,包括 60 次插入14 次删除

查看文件

@@ -108,6 +108,20 @@ QDF_STATUS reg_get_6g_ap_master_chan_list(struct wlan_objmgr_pdev *pdev,
enum reg_6g_ap_type ap_pwr_type,
struct regulatory_channel *chan_list);
/**
* reg_get_reg_maschan_lst_frm_6g_pwr_mode() - Return the mas_chan_list entry
* for based on the channel index and input power mode
* @supp_pwr_mode: 6G supported power mode
* @pdev_priv_obj: Pointer to pdev_priv_obj
* @chan_idx: Channel index
*
* Return: Pointer to struct regulatory_channel
*/
struct regulatory_channel *reg_get_reg_maschan_lst_frm_6g_pwr_mode(
enum supported_6g_pwr_types supp_pwr_mode,
struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj,
uint16_t chan_idx);
#ifdef CONFIG_REG_CLIENT
/**
* reg_get_power_string() - get power string from power enum type
@@ -138,6 +152,15 @@ reg_get_6g_ap_master_chan_list(struct wlan_objmgr_pdev *pdev,
{
return QDF_STATUS_E_FAILURE;
}
static inline
struct regulatory_channel *reg_get_reg_maschan_lst_frm_6g_pwr_mode(
enum supported_6g_pwr_types supp_pwr_mode,
struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj,
uint16_t chan_idx)
{
return NULL;
}
#endif /* CONFIG_BAND_6GHZ */
/**
* reg_process_master_chan_list() - Compute master channel list based on the
@@ -238,18 +261,4 @@ reg_get_secondary_current_chan_list(struct wlan_objmgr_pdev *pdev,
* Return - True, the channel is disabled, but not due to radar, else false.
*/
bool reg_is_chan_disabled_and_not_nol(struct regulatory_channel *chan);
/**
* reg_get_reg_maschan_lst_frm_6g_pwr_mode() - Return the mas_chan_list entry
* for based on the channel index and input power mode
* @supp_pwr_mode: 6G supported power mode
* @pdev_priv_obj: Pointer to pdev_priv_obj
* @chan_idx: Channel index
*
* Return: Pointer to struct regulatory_channel
*/
struct regulatory_channel *reg_get_reg_maschan_lst_frm_6g_pwr_mode(
enum supported_6g_pwr_types supp_pwr_mode,
struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj,
uint16_t chan_idx);
#endif

查看文件

@@ -1853,6 +1853,43 @@ QDF_STATUS
reg_get_superchan_entry(struct wlan_objmgr_pdev *pdev,
enum channel_enum chan_enum,
const struct super_chan_info **p_sup_chan_entry);
#else
static inline QDF_STATUS
reg_set_lower_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc, bool val)
{
return QDF_STATUS_E_NOSUPPORT;
}
static inline QDF_STATUS
reg_set_disable_upper_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc,
bool val)
{
return QDF_STATUS_E_NOSUPPORT;
}
static inline bool reg_is_lower_6g_edge_ch_supp(struct wlan_objmgr_psoc *psoc)
{
return false;
}
static inline bool
reg_is_upper_6g_edge_ch_disabled(struct wlan_objmgr_psoc *psoc)
{
return false;
}
static inline QDF_STATUS
reg_get_superchan_entry(struct wlan_objmgr_pdev *pdev,
enum channel_enum chan_enum,
const struct super_chan_info **p_sup_chan_entry)
{
return QDF_STATUS_E_NOSUPPORT;
}
static inline uint16_t reg_convert_enum_to_6g_idx(enum channel_enum ch_idx)
{
return INVALID_CHANNEL;
}
#endif
#ifdef FEATURE_WLAN_CH_AVOID_EXT