samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Move reg_set_ap_pwr_and_update_chan_list to reg_services_common.c

Browse Source 
Currently, reg_set_ap_pwr_and_update_chan_list is defined in reg_utils.c
which is compiled only for MCL. Move the definition of
reg_set_ap_pwr_and_update_chan_list to reg_services_common.c so that
it can be compiled and used by WIN APIs.

Change-Id: I433d2790b0d017290c2bdd3b06985d834a99629b
CRs-Fixed: 2964544
This commit is contained in:
Hariharan Basuthkar
2021-05-27 18:04:58 +05:30
committed by Madan Koyyalamudi
parent 8534447cef
commit 7220f18549
4 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
umac/regulatory/core/src/reg_services_common.c
View File

@@ -5567,6 +5567,28 @@ QDF_STATUS reg_get_client_power_for_6ghz_ap(struct wlan_objmgr_pdev *pdev,
return status; return status;
} }
QDF_STATUS reg_set_ap_pwr_and_update_chan_list(struct wlan_objmgr_pdev *pdev,
enum reg_6g_ap_type ap_pwr_type)
{
struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;
QDF_STATUS status;
pdev_priv_obj = reg_get_pdev_obj(pdev);
if (!IS_VALID_PDEV_REG_OBJ(pdev_priv_obj)) {
reg_err("pdev reg component is NULL");
return QDF_STATUS_E_INVAL;
}
status = reg_set_cur_6g_ap_pwr_type(pdev, ap_pwr_type);
if (QDF_IS_STATUS_ERROR(status)) {
reg_debug("failed to set AP power type to %d", ap_pwr_type);
return status;
}
reg_compute_pdev_current_chan_list(pdev_priv_obj);
return QDF_STATUS_SUCCESS;
}
#endif #endif
bool reg_is_regdb_offloaded(struct wlan_objmgr_psoc *psoc) bool reg_is_regdb_offloaded(struct wlan_objmgr_psoc *psoc)

19
umac/regulatory/core/src/reg_services_common.h
View File

@@ -1513,6 +1513,18 @@ QDF_STATUS reg_get_client_power_for_6ghz_ap(struct wlan_objmgr_pdev *pdev,
qdf_freq_t chan_freq, qdf_freq_t chan_freq,
bool *is_psd, uint16_t *tx_power, bool *is_psd, uint16_t *tx_power,
uint16_t *eirp_psd_power); uint16_t *eirp_psd_power);
/**
* reg_set_ap_pwr_and_update_chan_list() - Set the AP power mode and recompute
* the current channel list
*
* @pdev: pdev ptr
* @ap_pwr_type: the AP power type to update to
*
* Return: QDF_STATUS
*/
QDF_STATUS reg_set_ap_pwr_and_update_chan_list(struct wlan_objmgr_pdev *pdev,
enum reg_6g_ap_type ap_pwr_type);
#else #else
static inline QDF_STATUS static inline QDF_STATUS
reg_set_cur_6g_ap_pwr_type(struct wlan_objmgr_pdev *pdev, reg_set_cur_6g_ap_pwr_type(struct wlan_objmgr_pdev *pdev,
@@ -1598,6 +1610,13 @@ QDF_STATUS reg_get_client_power_for_6ghz_ap(struct wlan_objmgr_pdev *pdev,
*eirp_psd_power = 0; *eirp_psd_power = 0;
return QDF_STATUS_E_NOSUPPORT; return QDF_STATUS_E_NOSUPPORT;
} }
static inline
QDF_STATUS reg_set_ap_pwr_and_update_chan_list(struct wlan_objmgr_pdev *pdev,
enum reg_6g_ap_type ap_pwr_type)
{
return QDF_STATUS_E_NOSUPPORT;
}
#endif #endif
#ifdef CONFIG_HOST_FIND_CHAN #ifdef CONFIG_HOST_FIND_CHAN

23
umac/regulatory/core/src/reg_utils.c
View File

@@ -759,29 +759,6 @@ enum reg_6g_ap_type reg_decide_6g_ap_pwr_type(struct wlan_objmgr_pdev *pdev)
return ap_pwr_type; return ap_pwr_type;
} }
QDF_STATUS reg_set_ap_pwr_and_update_chan_list(struct wlan_objmgr_pdev *pdev,
enum reg_6g_ap_type ap_pwr_type)
{
struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;
QDF_STATUS status;
pdev_priv_obj = reg_get_pdev_obj(pdev);
if (!IS_VALID_PDEV_REG_OBJ(pdev_priv_obj)) {
reg_err("pdev reg component is NULL");
return QDF_STATUS_E_INVAL;
}
status = reg_set_cur_6g_ap_pwr_type(pdev, ap_pwr_type);
if (QDF_IS_STATUS_ERROR(status)) {
reg_debug("failed to set AP power type to %d", ap_pwr_type);
return status;
}
reg_compute_pdev_current_chan_list(pdev_priv_obj);
return QDF_STATUS_SUCCESS;
}
#endif /* CONFIG_BAND_6GHZ */ #endif /* CONFIG_BAND_6GHZ */
#endif /* CONFIG_REG_CLIENT */ #endif /* CONFIG_REG_CLIENT */

26
umac/regulatory/core/src/reg_utils.h
View File

@@ -383,31 +383,12 @@ bool reg_ignore_default_country(struct wlan_regulatory_psoc_priv_obj *soc_reg,
* Return: AP power type * Return: AP power type
*/ */
enum reg_6g_ap_type reg_decide_6g_ap_pwr_type(struct wlan_objmgr_pdev *pdev); enum reg_6g_ap_type reg_decide_6g_ap_pwr_type(struct wlan_objmgr_pdev *pdev);
/**
* reg_set_ap_pwr_and_update_chan_list() - Set the AP power mode and recompute
* the current channel list
*
* @pdev: pdev ptr
* @ap_pwr_type: the AP power type to update to
*
* Return: QDF_STATUS
*/
QDF_STATUS reg_set_ap_pwr_and_update_chan_list(struct wlan_objmgr_pdev *pdev,
enum reg_6g_ap_type ap_pwr_type);
#else #else
static inline enum reg_6g_ap_type static inline enum reg_6g_ap_type
reg_decide_6g_ap_pwr_type(struct wlan_objmgr_pdev *pdev) reg_decide_6g_ap_pwr_type(struct wlan_objmgr_pdev *pdev)
{ {
return REG_CURRENT_MAX_AP_TYPE; return REG_CURRENT_MAX_AP_TYPE;
} }
static inline
QDF_STATUS reg_set_ap_pwr_and_update_chan_list(struct wlan_objmgr_pdev *pdev,
enum reg_6g_ap_type ap_pwr_type)
{
return QDF_STATUS_E_NOSUPPORT;
}
#endif /* CONFIG_BAND_6GHZ */ #endif /* CONFIG_BAND_6GHZ */
#else #else
static inline QDF_STATUS reg_read_current_country(struct wlan_objmgr_psoc *psoc, static inline QDF_STATUS reg_read_current_country(struct wlan_objmgr_psoc *psoc,
@@ -512,13 +493,6 @@ reg_decide_6g_ap_pwr_type(struct wlan_objmgr_pdev *pdev)
{ {
return REG_CURRENT_MAX_AP_TYPE; return REG_CURRENT_MAX_AP_TYPE;
} }
static inline
QDF_STATUS reg_set_ap_pwr_and_update_chan_list(struct wlan_objmgr_pdev *pdev,
enum reg_6g_ap_type ap_pwr_type)
{
return QDF_STATUS_E_NOSUPPORT;
}
#endif /* CONFIG_REG_CLIENT */ #endif /* CONFIG_REG_CLIENT */
#if defined(WLAN_FEATURE_DSRC) && defined(CONFIG_REG_CLIENT) #if defined(WLAN_FEATURE_DSRC) && defined(CONFIG_REG_CLIENT)