diff --git a/Kbuild b/Kbuild index 1429903c2704..e5ef7a438e0e 100644 --- a/Kbuild +++ b/Kbuild @@ -963,7 +963,8 @@ endif UMAC_MLME_INC := -I$(WLAN_COMMON_INC)/umac/mlme \ -I$(WLAN_COMMON_INC)/umac/mlme/mlme_objmgr/dispatcher/inc \ -I$(WLAN_COMMON_INC)/umac/mlme/vdev_mgr/dispatcher/inc \ - -I$(WLAN_COMMON_INC)/umac/mlme/pdev_mgr/dispatcher/inc + -I$(WLAN_COMMON_INC)/umac/mlme/pdev_mgr/dispatcher/inc \ + -I$(WLAN_COMMON_INC)/umac/mlme/psoc_mgr/dispatcher/inc UMAC_MLME_OBJS := $(WLAN_COMMON_ROOT)/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.o \ $(WLAN_COMMON_ROOT)/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.o \ @@ -975,7 +976,9 @@ UMAC_MLME_OBJS := $(WLAN_COMMON_ROOT)/umac/mlme/mlme_objmgr/dispatcher/src/wlan_ $(WLAN_COMMON_ROOT)/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_utils_api.o \ $(WLAN_COMMON_ROOT)/umac/mlme/mlme_objmgr/dispatcher/src/wlan_cmn_mlme_main.o \ $(WLAN_COMMON_ROOT)/umac/mlme/mlme_objmgr/dispatcher/src/wlan_pdev_mlme_main.o \ - $(WLAN_COMMON_ROOT)/umac/mlme/pdev_mgr/dispatcher/src/wlan_pdev_mlme_api.o + $(WLAN_COMMON_ROOT)/umac/mlme/pdev_mgr/dispatcher/src/wlan_pdev_mlme_api.o \ + $(WLAN_COMMON_ROOT)/umac/mlme/mlme_objmgr/dispatcher/src/wlan_psoc_mlme_main.o \ + $(WLAN_COMMON_ROOT)/umac/mlme/psoc_mgr/dispatcher/src/wlan_psoc_mlme_api.o ######## MLME ############## MLME_DIR := components/mlme diff --git a/components/mlme/core/inc/wlan_mlme_main.h b/components/mlme/core/inc/wlan_mlme_main.h index 16fe2aae7216..6dbd4aea3e28 100644 --- a/components/mlme/core/inc/wlan_mlme_main.h +++ b/components/mlme/core/inc/wlan_mlme_main.h @@ -36,10 +36,10 @@ #define mlme_legacy_debug(params...) QDF_TRACE_DEBUG(QDF_MODULE_ID_MLME, params) /** - * struct wlan_mlme_psoc_obj -MLME psoc priv object + * struct wlan_mlme_psoc_ext_obj -MLME ext psoc priv object * @cfg: cfg items */ -struct wlan_mlme_psoc_obj { +struct wlan_mlme_psoc_ext_obj { struct wlan_mlme_cfg cfg; }; @@ -270,32 +270,6 @@ struct wlan_mlme_nss_chains *mlme_get_ini_vdev_config( struct mlme_roam_after_data_stall * mlme_get_roam_invoke_params(struct wlan_objmgr_vdev *vdev); -/** - * mlme_psoc_object_created_notification(): mlme psoc create handler - * @psoc: psoc which is going to created by objmgr - * @arg: argument for vdev create handler - * - * Register this api with objmgr to detect psoc is created - * - * Return: QDF_STATUS status in case of success else return error - */ -QDF_STATUS -mlme_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, - void *arg); - -/** - * mlme_psoc_object_destroyed_notification(): mlme psoc delete handler - * @psoc: psoc which is going to delete by objmgr - * @arg: argument for vdev delete handler - * - * Register this api with objmgr to detect psoc is deleted - * - * Return: QDF_STATUS status in case of success else return error - */ -QDF_STATUS -mlme_psoc_object_destroyed_notification(struct wlan_objmgr_psoc *psoc, - void *arg); - /** * mlme_cfg_on_psoc_enable() - Populate MLME structure from CFG and INI * @psoc: pointer to the psoc object @@ -307,17 +281,19 @@ mlme_psoc_object_destroyed_notification(struct wlan_objmgr_psoc *psoc, QDF_STATUS mlme_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc); /** - * mlme_get_psoc_obj() - Get MLME object from psoc + * mlme_get_psoc_ext_obj() - Get MLME object from psoc * @psoc: pointer to the psoc object * * Get the MLME object pointer from the psoc * * Return: pointer to MLME object */ -#define mlme_get_psoc_obj(psoc) mlme_get_psoc_obj_fl(psoc, __func__, __LINE__) -struct wlan_mlme_psoc_obj *mlme_get_psoc_obj_fl(struct wlan_objmgr_psoc *psoc, - const char *func, - uint32_t line); +#define mlme_get_psoc_ext_obj(psoc) \ + mlme_get_psoc_ext_obj_fl(psoc, __func__, __LINE__) +struct wlan_mlme_psoc_ext_obj *mlme_get_psoc_ext_obj_fl(struct wlan_objmgr_psoc + *psoc, + const char *func, + uint32_t line); /** * mlme_init_ibss_cfg() - Init IBSS config data structure with default CFG value diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index c60995d2a97e..c86244bbadb8 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -24,24 +24,19 @@ #include "cfg_ucfg_api.h" #include "wmi_unified.h" #include "wlan_scan_public_structs.h" +#include "wlan_psoc_mlme_api.h" #include "wlan_vdev_mlme_api.h" #include "wlan_mlme_api.h" #include #define NUM_OF_SOUNDING_DIMENSIONS 1 /*Nss - 1, (Nss = 2 for 2x2)*/ -struct wlan_mlme_psoc_obj *mlme_get_psoc_obj_fl(struct wlan_objmgr_psoc *psoc, - const char *func, uint32_t line) +struct wlan_mlme_psoc_ext_obj *mlme_get_psoc_ext_obj_fl( + struct wlan_objmgr_psoc *psoc, + const char *func, uint32_t line) { - struct wlan_mlme_psoc_obj *mlme_obj; - mlme_obj = (struct wlan_mlme_psoc_obj *) - wlan_objmgr_psoc_get_comp_private_obj(psoc, - WLAN_UMAC_COMP_MLME); - if (!mlme_obj) - mlme_legacy_err("mlme obj is null, %s:%d", func, line); - - return mlme_obj; + return wlan_psoc_mlme_get_ext_hdl(psoc); } struct wlan_mlme_nss_chains *mlme_get_dynamic_vdev_config( @@ -99,55 +94,6 @@ uint8_t *mlme_get_dynamic_oce_flags(struct wlan_objmgr_vdev *vdev) return &mlme_priv->sta_dynamic_oce_value; } -QDF_STATUS -mlme_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, - void *arg) -{ - QDF_STATUS status; - struct wlan_mlme_psoc_obj *mlme_obj; - - mlme_obj = qdf_mem_malloc(sizeof(struct wlan_mlme_psoc_obj)); - if (!mlme_obj) { - mlme_legacy_err("Failed to allocate memory"); - return QDF_STATUS_E_NOMEM; - } - - status = wlan_objmgr_psoc_component_obj_attach(psoc, - WLAN_UMAC_COMP_MLME, - mlme_obj, - QDF_STATUS_SUCCESS); - if (status != QDF_STATUS_SUCCESS) { - mlme_legacy_err("Failed to attach psoc_ctx with psoc"); - qdf_mem_free(mlme_obj); - } - - return status; -} - -QDF_STATUS -mlme_psoc_object_destroyed_notification(struct wlan_objmgr_psoc *psoc, - void *arg) -{ - struct wlan_mlme_psoc_obj *mlme_obj = NULL; - QDF_STATUS status; - - mlme_obj = mlme_get_psoc_obj(psoc); - - status = wlan_objmgr_psoc_component_obj_detach(psoc, - WLAN_UMAC_COMP_MLME, - mlme_obj); - if (status != QDF_STATUS_SUCCESS) { - mlme_legacy_err("Failed to detach psoc_ctx from psoc"); - status = QDF_STATUS_E_FAILURE; - goto out; - } - - qdf_mem_free(mlme_obj); - -out: - return status; -} - #ifdef CRYPTO_SET_KEY_CONVERGED QDF_STATUS mlme_get_peer_mic_len(struct wlan_objmgr_psoc *psoc, uint8_t pdev_id, uint8_t *peer_mac, uint8_t *mic_len, @@ -2405,11 +2351,11 @@ mlme_init_dot11_mode_cfg(struct wlan_mlme_dot11_mode *dot11_mode) QDF_STATUS mlme_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; struct wlan_mlme_cfg *mlme_cfg; QDF_STATUS status = QDF_STATUS_SUCCESS; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_FAILURE; diff --git a/components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c b/components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c index 63090966b881..c865c86342e2 100644 --- a/components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c +++ b/components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c @@ -25,6 +25,7 @@ #include "lim_types.h" #include #include <../../core/src/vdev_mgr_ops.h> +#include "wlan_psoc_mlme_api.h" static struct vdev_mlme_ops sta_mlme_ops; static struct vdev_mlme_ops ap_mlme_ops; @@ -1047,6 +1048,47 @@ vdevmgr_vdev_stop_rsp_handle(struct vdev_mlme_obj *vdev_mlme, return wma_vdev_stop_resp_handler(vdev_mlme, rsp); } +/** + * psoc_mlme_ext_hdl_create() - Create mlme legacy priv object + * @psoc_mlme: psoc mlme object + * + * Return: QDF_STATUS + */ +static +QDF_STATUS psoc_mlme_ext_hdl_create(struct psoc_mlme_obj *psoc_mlme) +{ + psoc_mlme->ext_psoc_ptr = + qdf_mem_malloc(sizeof(struct wlan_mlme_psoc_ext_obj)); + if (!psoc_mlme->ext_psoc_ptr) { + mlme_legacy_err("Failed to allocate memory"); + return QDF_STATUS_E_NOMEM; + } + + return QDF_STATUS_SUCCESS; +} + +/** + * psoc_mlme_ext_hdl_destroy() - Destroy mlme legacy priv object + * @psoc_mlme: psoc mlme object + * + * Return: QDF_STATUS + */ +static +QDF_STATUS psoc_mlme_ext_hdl_destroy(struct psoc_mlme_obj *psoc_mlme) +{ + if (!psoc_mlme) { + mlme_err("PSOC MLME is NULL"); + return QDF_STATUS_E_FAILURE; + } + + if (psoc_mlme->ext_psoc_ptr) { + qdf_mem_free(psoc_mlme->ext_psoc_ptr); + psoc_mlme->ext_psoc_ptr = NULL; + } + + return QDF_STATUS_SUCCESS; +} + /** * vdevmgr_vdev_delete_rsp_handle() - callback to handle vdev delete response * @vdev_mlme: vdev mlme object @@ -1209,13 +1251,19 @@ static struct vdev_mlme_ops mon_mlme_ops = { }; /** - * struct mlme_ext_ops - VDEV MLME legacy global callbacks structure + * struct mlme_ext_ops - MLME legacy global callbacks structure + * @mlme_psoc_ext_hdl_create: callback to invoke creation of legacy + * psoc object + * @mlme_psoc_ext_hdl_destroy: callback to invoke destroy of legacy + * psoc object * @mlme_vdev_ext_hdl_create: callback to invoke creation of legacy * vdev object * @mlme_vdev_ext_hdl_destroy: callback to invoke destroy of legacy * vdev object */ static struct mlme_ext_ops ext_ops = { + .mlme_psoc_ext_hdl_create = psoc_mlme_ext_hdl_create, + .mlme_psoc_ext_hdl_destroy = psoc_mlme_ext_hdl_destroy, .mlme_vdev_ext_hdl_create = vdevmgr_mlme_ext_hdl_create, .mlme_vdev_ext_hdl_destroy = vdevmgr_mlme_ext_hdl_destroy, }; diff --git a/components/mlme/dispatcher/inc/wlan_ext_mlme_obj_types.h b/components/mlme/dispatcher/inc/wlan_ext_mlme_obj_types.h index d2b6630eef3f..73e9e5424a5f 100644 --- a/components/mlme/dispatcher/inc/wlan_ext_mlme_obj_types.h +++ b/components/mlme/dispatcher/inc/wlan_ext_mlme_obj_types.h @@ -40,4 +40,10 @@ typedef struct opaque_mlme_pdev_ext mlme_pdev_ext_t; */ typedef struct mlme_legacy_priv mlme_vdev_ext_t; +/** + * typedef mlme_psoc_ext_t - Definition of psoc mlme pointer + * Define ext_psoc_ptr from external umac/mlme component point to this type + */ +typedef struct wlan_mlme_psoc_ext_obj mlme_psoc_ext_t; + #endif diff --git a/components/mlme/dispatcher/src/wlan_mlme_api.c b/components/mlme/dispatcher/src/wlan_mlme_api.c index 334074c8ad99..4a9c6c7e8401 100644 --- a/components/mlme/dispatcher/src/wlan_mlme_api.c +++ b/components/mlme/dispatcher/src/wlan_mlme_api.c @@ -62,9 +62,9 @@ QDF_STATUS wlan_mlme_set_cfg_str(uint8_t *src, struct mlme_cfg_str *dst_cfg_str, uint8_t wlan_mlme_get_tx_power(struct wlan_objmgr_psoc *psoc, enum band_info band) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return 0; @@ -81,9 +81,9 @@ uint8_t wlan_mlme_get_tx_power(struct wlan_objmgr_psoc *psoc, char *wlan_mlme_get_power_usage(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return NULL; @@ -94,9 +94,9 @@ QDF_STATUS wlan_mlme_get_ht_cap_info(struct wlan_objmgr_psoc *psoc, struct mlme_ht_capabilities_info *ht_cap_info) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -109,9 +109,9 @@ QDF_STATUS wlan_mlme_set_ht_cap_info(struct wlan_objmgr_psoc *psoc, struct mlme_ht_capabilities_info ht_cap_info) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -123,9 +123,9 @@ QDF_STATUS wlan_mlme_set_ht_cap_info(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_max_amsdu_num(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -137,9 +137,9 @@ QDF_STATUS wlan_mlme_get_max_amsdu_num(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_max_amsdu_num(struct wlan_objmgr_psoc *psoc, uint8_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -156,9 +156,9 @@ QDF_STATUS wlan_mlme_set_max_amsdu_num(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_ht_mpdu_density(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -170,9 +170,9 @@ QDF_STATUS wlan_mlme_get_ht_mpdu_density(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_ht_mpdu_density(struct wlan_objmgr_psoc *psoc, uint8_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -189,9 +189,9 @@ QDF_STATUS wlan_mlme_set_ht_mpdu_density(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_band_capability(struct wlan_objmgr_psoc *psoc, uint8_t *band_capability) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -204,9 +204,9 @@ QDF_STATUS wlan_mlme_set_band_capability(struct wlan_objmgr_psoc *psoc, uint8_t band_capability) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -218,9 +218,9 @@ QDF_STATUS wlan_mlme_set_band_capability(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_prevent_link_down(struct wlan_objmgr_psoc *psoc, bool *prevent_link_down) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -232,9 +232,9 @@ QDF_STATUS wlan_mlme_get_prevent_link_down(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_select_5ghz_margin(struct wlan_objmgr_psoc *psoc, uint8_t *select_5ghz_margin) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -246,9 +246,9 @@ QDF_STATUS wlan_mlme_get_select_5ghz_margin(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_rtt_mac_randomization(struct wlan_objmgr_psoc *psoc, bool *rtt_mac_randomization) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -260,9 +260,9 @@ QDF_STATUS wlan_mlme_get_rtt_mac_randomization(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_crash_inject(struct wlan_objmgr_psoc *psoc, bool *crash_inject) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -274,9 +274,9 @@ QDF_STATUS wlan_mlme_get_crash_inject(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_lpass_support(struct wlan_objmgr_psoc *psoc, bool *lpass_support) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -288,9 +288,9 @@ QDF_STATUS wlan_mlme_get_lpass_support(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_self_recovery(struct wlan_objmgr_psoc *psoc, bool *self_recovery) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -302,9 +302,9 @@ QDF_STATUS wlan_mlme_get_self_recovery(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sub_20_chan_width(struct wlan_objmgr_psoc *psoc, uint8_t *sub_20_chan_width) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -316,9 +316,9 @@ QDF_STATUS wlan_mlme_get_sub_20_chan_width(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_fw_timeout_crash(struct wlan_objmgr_psoc *psoc, bool *fw_timeout_crash) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -330,9 +330,9 @@ QDF_STATUS wlan_mlme_get_fw_timeout_crash(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_ito_repeat_count(struct wlan_objmgr_psoc *psoc, uint8_t *ito_repeat_count) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -344,9 +344,9 @@ QDF_STATUS wlan_mlme_get_ito_repeat_count(struct wlan_objmgr_psoc *psoc, void wlan_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return; @@ -356,7 +356,7 @@ void wlan_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_acs_with_more_param(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -368,7 +368,7 @@ QDF_STATUS wlan_mlme_get_acs_with_more_param(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_auto_channel_weight(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_AUTO_CHANNEL_SELECT_WEIGHT); @@ -382,7 +382,7 @@ QDF_STATUS wlan_mlme_get_auto_channel_weight(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_vendor_acs_support(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -395,7 +395,7 @@ QDF_STATUS wlan_mlme_get_acs_support_for_dfs_ltecoex(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -408,7 +408,7 @@ QDF_STATUS wlan_mlme_get_external_acs_policy(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -420,7 +420,7 @@ wlan_mlme_get_external_acs_policy(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_tx_chainmask_cck(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -432,7 +432,7 @@ QDF_STATUS wlan_mlme_get_tx_chainmask_cck(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_tx_chainmask_1ss(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -445,9 +445,9 @@ void wlan_mlme_update_cfg_with_tgt_caps(struct wlan_objmgr_psoc *psoc, struct mlme_tgt_caps *tgt_caps) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return; @@ -461,9 +461,9 @@ wlan_mlme_update_cfg_with_tgt_caps(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_get_he_ul_mumimo(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -475,9 +475,9 @@ QDF_STATUS wlan_mlme_cfg_get_he_ul_mumimo(struct wlan_objmgr_psoc *psoc, QDF_STATUS mlme_cfg_get_he_caps(struct wlan_objmgr_psoc *psoc, tDot11fIEhe_cap *he_cap) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -489,9 +489,9 @@ QDF_STATUS mlme_cfg_get_he_caps(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_set_he_ul_mumimo(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -509,9 +509,9 @@ QDF_STATUS wlan_mlme_cfg_set_he_ul_mumimo(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_get_enable_ul_mimo(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -523,9 +523,9 @@ QDF_STATUS wlan_mlme_cfg_get_enable_ul_mimo(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_get_enable_ul_ofdm(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -541,7 +541,7 @@ QDF_STATUS mlme_update_tgt_he_caps_in_cfg(struct wlan_objmgr_psoc *psoc, uint8_t chan_width; QDF_STATUS status = QDF_STATUS_SUCCESS; tDot11fIEhe_cap *he_cap = &wma_cfg->he_cap; - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); uint8_t value; uint16_t tx_mcs_map = 0; uint16_t rx_mcs_map = 0; @@ -838,7 +838,7 @@ QDF_STATUS mlme_update_tgt_he_caps_in_cfg(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_num_11b_tx_chains(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -850,7 +850,7 @@ QDF_STATUS wlan_mlme_get_num_11b_tx_chains(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_bt_chain_separation_flag(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -862,7 +862,7 @@ QDF_STATUS wlan_mlme_get_bt_chain_separation_flag(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_num_11ag_tx_chains(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -877,7 +877,7 @@ QDF_STATUS wlan_mlme_configure_chain_mask(struct wlan_objmgr_psoc *psoc, int ret_val; uint8_t ch_msk_val; struct wma_caps_per_phy non_dbs_phy_cap; - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); QDF_STATUS status; bool enable2x2, as_enabled, enable_bt_chain_sep; uint8_t dual_mac_feature; @@ -1014,9 +1014,9 @@ QDF_STATUS wlan_mlme_get_manufacturer_name(struct wlan_objmgr_psoc *psoc, uint8_t *pbuf, uint32_t *plen) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1030,9 +1030,9 @@ QDF_STATUS wlan_mlme_get_model_number(struct wlan_objmgr_psoc *psoc, uint8_t *pbuf, uint32_t *plen) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1047,9 +1047,9 @@ QDF_STATUS wlan_mlme_get_model_name(struct wlan_objmgr_psoc *psoc, uint8_t *pbuf, uint32_t *plen) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1063,9 +1063,9 @@ QDF_STATUS wlan_mlme_get_manufacture_product_version(struct wlan_objmgr_psoc *psoc, uint8_t *pbuf, uint32_t *plen) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1079,9 +1079,9 @@ QDF_STATUS wlan_mlme_get_manufacture_product_name(struct wlan_objmgr_psoc *psoc, uint8_t *pbuf, uint32_t *plen) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1095,9 +1095,9 @@ wlan_mlme_get_manufacture_product_name(struct wlan_objmgr_psoc *psoc, void wlan_mlme_get_tl_delayed_trgr_frm_int(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_TL_DELAYED_TRGR_FRM_INTERVAL); return; @@ -1110,9 +1110,9 @@ void wlan_mlme_get_tl_delayed_trgr_frm_int(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_dir_ac_vo(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1125,9 +1125,9 @@ QDF_STATUS wlan_mlme_get_wmm_dir_ac_vo(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_nom_msdu_size_ac_vo(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1139,9 +1139,9 @@ QDF_STATUS wlan_mlme_get_wmm_mean_data_rate_ac_vo(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1153,9 +1153,9 @@ wlan_mlme_get_wmm_mean_data_rate_ac_vo(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_min_phy_rate_ac_vo(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1166,9 +1166,9 @@ QDF_STATUS wlan_mlme_get_wmm_min_phy_rate_ac_vo(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_sba_ac_vo(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { return QDF_STATUS_E_FAILURE; } @@ -1181,9 +1181,9 @@ wlan_mlme_get_wmm_sba_ac_vo(struct wlan_objmgr_psoc *psoc, uint16_t *value) QDF_STATUS wlan_mlme_get_wmm_uapsd_vo_srv_intv(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1195,9 +1195,9 @@ QDF_STATUS wlan_mlme_get_wmm_uapsd_vo_srv_intv(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_uapsd_vo_sus_intv(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1209,9 +1209,9 @@ QDF_STATUS wlan_mlme_get_wmm_uapsd_vo_sus_intv(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_dir_ac_vi(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1223,9 +1223,9 @@ wlan_mlme_get_wmm_dir_ac_vi(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_wmm_nom_msdu_size_ac_vi(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1239,9 +1239,9 @@ QDF_STATUS wlan_mlme_get_wmm_mean_data_rate_ac_vi(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1253,9 +1253,9 @@ wlan_mlme_get_wmm_mean_data_rate_ac_vi(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_min_phy_rate_ac_vi(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1267,9 +1267,9 @@ QDF_STATUS wlan_mlme_get_wmm_min_phy_rate_ac_vi(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_sba_ac_vi(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1282,9 +1282,9 @@ QDF_STATUS wlan_mlme_get_wmm_uapsd_vi_srv_intv(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1296,9 +1296,9 @@ wlan_mlme_get_wmm_uapsd_vi_srv_intv(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_uapsd_vi_sus_intv(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1310,9 +1310,9 @@ QDF_STATUS wlan_mlme_get_wmm_uapsd_vi_sus_intv(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_dir_ac_be(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1324,9 +1324,9 @@ wlan_mlme_get_wmm_dir_ac_be(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_wmm_nom_msdu_size_ac_be(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1339,9 +1339,9 @@ QDF_STATUS wlan_mlme_get_wmm_mean_data_rate_ac_be(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1353,9 +1353,9 @@ wlan_mlme_get_wmm_mean_data_rate_ac_be(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_min_phy_rate_ac_be(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1367,9 +1367,9 @@ QDF_STATUS wlan_mlme_get_wmm_min_phy_rate_ac_be(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_sba_ac_be(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1381,9 +1381,9 @@ wlan_mlme_get_wmm_sba_ac_be(struct wlan_objmgr_psoc *psoc, uint16_t *value) QDF_STATUS wlan_mlme_get_wmm_uapsd_be_srv_intv(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1395,9 +1395,9 @@ QDF_STATUS wlan_mlme_get_wmm_uapsd_be_srv_intv(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_uapsd_be_sus_intv(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1409,9 +1409,9 @@ QDF_STATUS wlan_mlme_get_wmm_uapsd_be_sus_intv(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_dir_ac_bk(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1423,9 +1423,9 @@ wlan_mlme_get_wmm_dir_ac_bk(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_wmm_nom_msdu_size_ac_bk(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1438,9 +1438,9 @@ QDF_STATUS wlan_mlme_get_wmm_mean_data_rate_ac_bk(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1452,9 +1452,9 @@ wlan_mlme_get_wmm_mean_data_rate_ac_bk(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_min_phy_rate_ac_bk(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1466,9 +1466,9 @@ QDF_STATUS wlan_mlme_get_wmm_min_phy_rate_ac_bk(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_sba_ac_bk(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1481,9 +1481,9 @@ QDF_STATUS wlan_mlme_get_wmm_uapsd_bk_srv_intv(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1496,9 +1496,9 @@ QDF_STATUS wlan_mlme_get_wmm_uapsd_bk_sus_intv(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1510,9 +1510,9 @@ wlan_mlme_get_wmm_uapsd_bk_sus_intv(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_wmm_mode(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1524,9 +1524,9 @@ wlan_mlme_get_wmm_mode(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_80211e_is_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1538,9 +1538,9 @@ wlan_mlme_get_80211e_is_enabled(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_get_wmm_uapsd_mask(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1552,9 +1552,9 @@ wlan_mlme_get_wmm_uapsd_mask(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_implicit_qos_is_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1567,9 +1567,9 @@ QDF_STATUS wlan_mlme_get_implicit_qos_is_enabled(struct wlan_objmgr_psoc *psoc, void wlan_mlme_get_inactivity_interval(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_QOS_WMM_INACTIVITY_INTERVAL); return; @@ -1582,9 +1582,9 @@ void wlan_mlme_get_inactivity_interval(struct wlan_objmgr_psoc *psoc, void wlan_mlme_get_is_ts_burst_size_enable(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_QOS_WMM_BURST_SIZE_DEFN); return; @@ -1596,9 +1596,9 @@ void wlan_mlme_get_is_ts_burst_size_enable(struct wlan_objmgr_psoc *psoc, void wlan_mlme_get_ts_info_ack_policy(struct wlan_objmgr_psoc *psoc, enum mlme_ts_info_ack_policy *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_QOS_WMM_TS_INFO_ACK_POLICY); return; @@ -1611,9 +1611,9 @@ void wlan_mlme_get_ts_info_ack_policy(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_ts_acm_value_for_ac(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1625,9 +1625,9 @@ wlan_mlme_get_ts_acm_value_for_ac(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_get_listen_interval(struct wlan_objmgr_psoc *psoc, int *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1639,9 +1639,9 @@ QDF_STATUS wlan_mlme_get_listen_interval(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_sap_listen_interval(struct wlan_objmgr_psoc *psoc, int value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1656,9 +1656,9 @@ QDF_STATUS wlan_mlme_set_sap_listen_interval(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_assoc_sta_limit(struct wlan_objmgr_psoc *psoc, int value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1673,9 +1673,9 @@ QDF_STATUS wlan_mlme_set_assoc_sta_limit(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_rmc_action_period_freq(struct wlan_objmgr_psoc *psoc, int value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1690,9 +1690,9 @@ QDF_STATUS wlan_mlme_set_rmc_action_period_freq(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_get_peer_info(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1704,9 +1704,9 @@ QDF_STATUS wlan_mlme_get_sap_get_peer_info(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_sap_get_peer_info(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1719,9 +1719,9 @@ QDF_STATUS wlan_mlme_get_sap_bcast_deauth_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1733,9 +1733,9 @@ wlan_mlme_get_sap_bcast_deauth_enabled(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_allow_all_channels(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1747,9 +1747,9 @@ QDF_STATUS wlan_mlme_get_sap_allow_all_channels(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_max_peers(struct wlan_objmgr_psoc *psoc, int *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1761,9 +1761,9 @@ QDF_STATUS wlan_mlme_get_sap_max_peers(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_sap_max_peers(struct wlan_objmgr_psoc *psoc, int value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1778,9 +1778,9 @@ QDF_STATUS wlan_mlme_set_sap_max_peers(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_max_offload_peers(struct wlan_objmgr_psoc *psoc, int *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1792,9 +1792,9 @@ QDF_STATUS wlan_mlme_get_sap_max_offload_peers(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_max_offload_reorder_buffs(struct wlan_objmgr_psoc *psoc, int *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1806,9 +1806,9 @@ QDF_STATUS wlan_mlme_get_sap_max_offload_reorder_buffs(struct wlan_objmgr_psoc QDF_STATUS wlan_mlme_get_sap_chn_switch_bcn_count(struct wlan_objmgr_psoc *psoc, int *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1820,9 +1820,9 @@ QDF_STATUS wlan_mlme_get_sap_chn_switch_bcn_count(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_chn_switch_mode(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1834,9 +1834,9 @@ QDF_STATUS wlan_mlme_get_sap_chn_switch_mode(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_internal_restart(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1848,9 +1848,9 @@ QDF_STATUS wlan_mlme_get_sap_internal_restart(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_max_modulated_dtim(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1862,9 +1862,9 @@ QDF_STATUS wlan_mlme_get_sap_max_modulated_dtim(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_chan_pref_location(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1876,9 +1876,9 @@ QDF_STATUS wlan_mlme_get_sap_chan_pref_location(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_country_priority(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1890,9 +1890,9 @@ QDF_STATUS wlan_mlme_get_sap_country_priority(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_sap_reduced_beacon_interval(struct wlan_objmgr_psoc *psoc, int *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_REDUCED_BEACON_INTERVAL); return QDF_STATUS_E_FAILURE; @@ -1906,9 +1906,9 @@ QDF_STATUS wlan_mlme_get_sap_reduced_beacon_interval(struct wlan_objmgr_psoc QDF_STATUS wlan_mlme_get_sap_chan_switch_rate_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1920,9 +1920,9 @@ QDF_STATUS wlan_mlme_get_sap_chan_switch_rate_enabled(struct wlan_objmgr_psoc QDF_STATUS wlan_mlme_get_sap_force_11n_for_11ac(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1934,9 +1934,9 @@ QDF_STATUS wlan_mlme_get_sap_force_11n_for_11ac(struct wlan_objmgr_psoc QDF_STATUS wlan_mlme_get_go_force_11n_for_11ac(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -1948,9 +1948,9 @@ QDF_STATUS wlan_mlme_get_go_force_11n_for_11ac(struct wlan_objmgr_psoc QDF_STATUS wlan_mlme_is_sap_11ac_override(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_SAP_11AC_OVERRIDE); return QDF_STATUS_E_FAILURE; @@ -1963,9 +1963,9 @@ QDF_STATUS wlan_mlme_is_sap_11ac_override(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_is_go_11ac_override(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_GO_11AC_OVERRIDE); return QDF_STATUS_E_FAILURE; @@ -1978,9 +1978,9 @@ QDF_STATUS wlan_mlme_is_go_11ac_override(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_sap_11ac_override(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; mlme_obj->cfg.sap_cfg.sap_11ac_override = value; @@ -1991,9 +1991,9 @@ QDF_STATUS wlan_mlme_set_sap_11ac_override(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_go_11ac_override(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; mlme_obj->cfg.sap_cfg.go_11ac_override = value; @@ -2004,7 +2004,7 @@ QDF_STATUS wlan_mlme_set_go_11ac_override(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_oce_sta_enabled_info(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2016,7 +2016,7 @@ QDF_STATUS wlan_mlme_get_oce_sta_enabled_info(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_oce_sap_enabled_info(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2062,7 +2062,7 @@ void wlan_mlme_update_oce_flags(struct wlan_objmgr_pdev *pdev) { uint16_t sap_connected_peer, go_connected_peer; struct wlan_objmgr_psoc *psoc = NULL; - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; uint8_t updated_fw_value = 0; psoc = wlan_pdev_get_psoc(pdev); @@ -2073,7 +2073,7 @@ void wlan_mlme_update_oce_flags(struct wlan_objmgr_pdev *pdev) wlan_util_get_peer_count_for_mode(pdev, QDF_SAP_MODE); go_connected_peer = wlan_util_get_peer_count_for_mode(pdev, QDF_P2P_GO_MODE); - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (sap_connected_peer || go_connected_peer) { updated_fw_value = mlme_obj->cfg.oce.feature_bitmap; @@ -2096,9 +2096,9 @@ void wlan_mlme_update_oce_flags(struct wlan_objmgr_pdev *pdev) bool wlan_mlme_is_ap_prot_enabled(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return false; @@ -2108,9 +2108,9 @@ bool wlan_mlme_is_ap_prot_enabled(struct wlan_objmgr_psoc *psoc) QDF_STATUS wlan_mlme_get_ap_protection_mode(struct wlan_objmgr_psoc *psoc, uint16_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2122,9 +2122,9 @@ QDF_STATUS wlan_mlme_get_ap_protection_mode(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_is_ap_obss_prot_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2136,9 +2136,9 @@ QDF_STATUS wlan_mlme_is_ap_obss_prot_enabled(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_rts_threshold(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2150,7 +2150,7 @@ QDF_STATUS wlan_mlme_get_rts_threshold(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_rts_threshold(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; tp_wma_handle wma_handle; wma_handle = cds_get_context(QDF_MODULE_ID_WMA); @@ -2160,7 +2160,7 @@ QDF_STATUS wlan_mlme_set_rts_threshold(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_E_INVAL; } - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2174,9 +2174,9 @@ QDF_STATUS wlan_mlme_set_rts_threshold(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_frag_threshold(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2188,7 +2188,7 @@ QDF_STATUS wlan_mlme_get_frag_threshold(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_frag_threshold(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; tp_wma_handle wma_handle; wma_handle = cds_get_context(QDF_MODULE_ID_WMA); @@ -2198,7 +2198,7 @@ QDF_STATUS wlan_mlme_set_frag_threshold(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_E_INVAL; } - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2213,7 +2213,7 @@ QDF_STATUS wlan_mlme_set_frag_threshold(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_fils_enabled_info(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2225,7 +2225,7 @@ QDF_STATUS wlan_mlme_get_fils_enabled_info(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_fils_enabled_info(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2237,7 +2237,7 @@ QDF_STATUS wlan_mlme_set_fils_enabled_info(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_enable_bcast_probe_rsp(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2250,9 +2250,9 @@ QDF_STATUS wlan_mlme_get_sta_miracast_mcc_rest_time(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2265,9 +2265,9 @@ QDF_STATUS wlan_mlme_get_sap_mcc_chnl_avoid(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2280,9 +2280,9 @@ QDF_STATUS wlan_mlme_get_mcc_bcast_prob_resp(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2295,9 +2295,9 @@ QDF_STATUS wlan_mlme_get_mcc_rts_cts_prot(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2310,9 +2310,9 @@ QDF_STATUS wlan_mlme_get_mcc_feature(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2565,9 +2565,9 @@ QDF_STATUS mlme_set_wep_key(struct wlan_mlme_wep_cfg *wep_params, QDF_STATUS wlan_mlme_is_11h_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2579,9 +2579,9 @@ wlan_mlme_is_11h_enabled(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_set_11h_enabled(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2593,9 +2593,9 @@ wlan_mlme_set_11h_enabled(struct wlan_objmgr_psoc *psoc, bool value) QDF_STATUS wlan_mlme_is_11d_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2607,9 +2607,9 @@ wlan_mlme_is_11d_enabled(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_set_11d_enabled(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2621,9 +2621,9 @@ wlan_mlme_set_11d_enabled(struct wlan_objmgr_psoc *psoc, bool value) bool wlan_mlme_is_change_channel_bandwidth_enabled(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return cfg_default(CFG_CHANGE_CHANNEL_BANDWIDTH); @@ -2633,9 +2633,9 @@ wlan_mlme_is_change_channel_bandwidth_enabled(struct wlan_objmgr_psoc *psoc) QDF_STATUS wlan_mlme_cfg_set_vht_chan_width(struct wlan_objmgr_psoc *psoc, uint8_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2652,9 +2652,9 @@ wlan_mlme_cfg_set_vht_chan_width(struct wlan_objmgr_psoc *psoc, uint8_t value) QDF_STATUS wlan_mlme_cfg_get_vht_chan_width(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2666,9 +2666,9 @@ wlan_mlme_cfg_get_vht_chan_width(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_cfg_set_vht_ldpc_coding_cap(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2681,9 +2681,9 @@ QDF_STATUS wlan_mlme_cfg_set_short_gi_160_mhz(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2695,9 +2695,9 @@ wlan_mlme_cfg_set_short_gi_160_mhz(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_get_short_gi_160_mhz(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2709,9 +2709,9 @@ wlan_mlme_cfg_get_short_gi_160_mhz(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_cfg_get_vht_tx_stbc(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2723,9 +2723,9 @@ wlan_mlme_cfg_get_vht_tx_stbc(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_cfg_get_vht_rx_stbc(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2738,9 +2738,9 @@ QDF_STATUS wlan_mlme_cfg_set_vht_tx_bfee_ant_supp(struct wlan_objmgr_psoc *psoc, uint8_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2753,9 +2753,9 @@ QDF_STATUS wlan_mlme_cfg_get_vht_tx_bfee_ant_supp(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2767,9 +2767,9 @@ wlan_mlme_cfg_get_vht_tx_bfee_ant_supp(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_get_vht_rx_mcs_map(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2781,9 +2781,9 @@ QDF_STATUS wlan_mlme_cfg_get_vht_rx_mcs_map(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_set_vht_rx_mcs_map(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2795,9 +2795,9 @@ QDF_STATUS wlan_mlme_cfg_set_vht_rx_mcs_map(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_get_vht_tx_mcs_map(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2809,9 +2809,9 @@ QDF_STATUS wlan_mlme_cfg_get_vht_tx_mcs_map(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_cfg_set_vht_tx_mcs_map(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2824,9 +2824,9 @@ QDF_STATUS wlan_mlme_cfg_set_vht_rx_supp_data_rate(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2839,9 +2839,9 @@ QDF_STATUS wlan_mlme_cfg_set_vht_tx_supp_data_rate(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2854,9 +2854,9 @@ QDF_STATUS wlan_mlme_cfg_get_vht_basic_mcs_set(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2869,9 +2869,9 @@ QDF_STATUS wlan_mlme_cfg_set_vht_basic_mcs_set(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2883,9 +2883,9 @@ wlan_mlme_cfg_set_vht_basic_mcs_set(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_vht_enable_tx_bf(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2897,9 +2897,9 @@ wlan_mlme_get_vht_enable_tx_bf(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_get_vht_tx_su_beamformer(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2911,9 +2911,9 @@ wlan_mlme_get_vht_tx_su_beamformer(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_get_vht_channel_width(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2926,9 +2926,9 @@ wlan_mlme_get_vht_channel_width(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_vht_rx_mcs_8_9(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2940,9 +2940,9 @@ wlan_mlme_get_vht_rx_mcs_8_9(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_vht_tx_mcs_8_9(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2954,9 +2954,9 @@ wlan_mlme_get_vht_tx_mcs_8_9(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_vht_rx_mcs_2x2(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2968,9 +2968,9 @@ wlan_mlme_get_vht_rx_mcs_2x2(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_vht_tx_mcs_2x2(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2982,9 +2982,9 @@ wlan_mlme_get_vht_tx_mcs_2x2(struct wlan_objmgr_psoc *psoc, uint8_t *value) QDF_STATUS wlan_mlme_get_vht20_mcs9(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -2996,9 +2996,9 @@ wlan_mlme_get_vht20_mcs9(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_get_vht_enable2x2(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3010,9 +3010,9 @@ wlan_mlme_get_vht_enable2x2(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_set_vht_enable2x2(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3024,9 +3024,9 @@ wlan_mlme_set_vht_enable2x2(struct wlan_objmgr_psoc *psoc, bool value) QDF_STATUS wlan_mlme_get_vht_enable_paid(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3038,9 +3038,9 @@ wlan_mlme_get_vht_enable_paid(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_get_vht_enable_gid(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3052,9 +3052,9 @@ wlan_mlme_get_vht_enable_gid(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_get_vht_for_24ghz(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3066,9 +3066,9 @@ wlan_mlme_get_vht_for_24ghz(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS wlan_mlme_set_vht_for_24ghz(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3080,9 +3080,9 @@ wlan_mlme_set_vht_for_24ghz(struct wlan_objmgr_psoc *psoc, bool value) QDF_STATUS wlan_mlme_get_vendor_vht_for_24ghz(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3094,12 +3094,12 @@ wlan_mlme_get_vendor_vht_for_24ghz(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS mlme_update_vht_cap(struct wlan_objmgr_psoc *psoc, struct wma_tgt_vht_cap *cfg) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; struct mlme_vht_capabilities_info *vht_cap_info; uint32_t value = 0; bool hw_rx_ldpc_enabled; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3191,11 +3191,11 @@ mlme_update_vht_cap(struct wlan_objmgr_psoc *psoc, struct wma_tgt_vht_cap *cfg) QDF_STATUS mlme_update_nss_vht_cap(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; struct mlme_vht_capabilities_info *vht_cap_info; uint32_t temp = 0; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3234,9 +3234,9 @@ QDF_STATUS mlme_update_nss_vht_cap(struct wlan_objmgr_psoc *psoc) QDF_STATUS wlan_mlme_is_sap_uapsd_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3248,9 +3248,9 @@ QDF_STATUS wlan_mlme_is_sap_uapsd_enabled(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_dtim_selection_diversity(struct wlan_objmgr_psoc *psoc, uint32_t *dtim_selection_div) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *dtim_selection_div = cfg_default(CFG_DTIM_SELECTION_DIVERSITY); return QDF_STATUS_E_FAILURE; @@ -3264,9 +3264,9 @@ QDF_STATUS wlan_mlme_get_dtim_selection_diversity(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_bmps_min_listen_interval(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_BMPS_MINIMUM_LI); return QDF_STATUS_E_FAILURE; @@ -3280,9 +3280,9 @@ QDF_STATUS wlan_mlme_get_bmps_min_listen_interval(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_bmps_max_listen_interval(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_BMPS_MAXIMUM_LI); return QDF_STATUS_E_FAILURE; @@ -3296,9 +3296,9 @@ QDF_STATUS wlan_mlme_get_bmps_max_listen_interval(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_set_sap_uapsd_flag(struct wlan_objmgr_psoc *psoc, bool value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3310,9 +3310,9 @@ QDF_STATUS wlan_mlme_set_sap_uapsd_flag(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_rrm_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3323,9 +3323,9 @@ QDF_STATUS wlan_mlme_get_rrm_enabled(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_auto_bmps_timer_value(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_AUTO_BMPS_ENABLE_TIMER); return QDF_STATUS_E_FAILURE; @@ -3339,9 +3339,9 @@ QDF_STATUS wlan_mlme_get_auto_bmps_timer_value(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_is_bmps_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_ENABLE_PS); return QDF_STATUS_E_FAILURE; @@ -3355,9 +3355,9 @@ QDF_STATUS wlan_mlme_is_bmps_enabled(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_is_imps_enabled(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_ENABLE_IMPS); return QDF_STATUS_E_FAILURE; @@ -3370,9 +3370,9 @@ QDF_STATUS wlan_mlme_is_imps_enabled(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_override_bmps_imps(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3394,9 +3394,9 @@ QDF_STATUS wlan_mlme_get_self_gen_frm_pwr(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_SELF_GEN_FRM_PWR); mlme_legacy_err("Failed to get MLME Obj"); @@ -3413,7 +3413,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, { struct wlan_mlme_ibss_cfg *ibss_cfg; int ret; - struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc); + struct wlan_mlme_psoc_ext_obj *mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3498,9 +3498,9 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_4way_hs_offload(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_DISABLE_4WAY_HS_OFFLOAD); mlme_legacy_err("Failed to get MLME Obj"); @@ -3532,9 +3532,9 @@ QDF_STATUS mlme_get_peer_phymode(struct wlan_objmgr_psoc *psoc, uint8_t *mac, QDF_STATUS mlme_set_tgt_wpa3_roam_cap(struct wlan_objmgr_psoc *psoc, uint32_t akm_bitmap) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; @@ -3547,9 +3547,10 @@ QDF_STATUS wlan_mlme_get_ignore_fw_reg_offload_ind(struct wlan_objmgr_psoc *psoc, bool *disabled) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; + + mlme_obj = mlme_get_psoc_ext_obj(psoc); - mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_FAILURE; diff --git a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c index e74f2b0748fe..214896ad66bc 100644 --- a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c +++ b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c @@ -45,24 +45,6 @@ QDF_STATUS ucfg_mlme_init(void) { QDF_STATUS status; - status = wlan_objmgr_register_psoc_create_handler( - WLAN_UMAC_COMP_MLME, - mlme_psoc_object_created_notification, - NULL); - if (status != QDF_STATUS_SUCCESS) { - mlme_legacy_err("unable to register psoc create handle"); - return status; - } - - status = wlan_objmgr_register_psoc_destroy_handler( - WLAN_UMAC_COMP_MLME, - mlme_psoc_object_destroyed_notification, - NULL); - if (status != QDF_STATUS_SUCCESS) { - mlme_legacy_err("unable to register psoc create handle"); - return status; - } - status = wlan_objmgr_register_peer_create_handler( WLAN_UMAC_COMP_MLME, mlme_peer_object_created_notification, @@ -102,21 +84,6 @@ QDF_STATUS ucfg_mlme_deinit(void) if (QDF_IS_STATUS_ERROR(status)) mlme_legacy_err("unable to unregister peer create handle"); - status = wlan_objmgr_unregister_psoc_destroy_handler( - WLAN_UMAC_COMP_MLME, - mlme_psoc_object_destroyed_notification, - NULL); - if (QDF_IS_STATUS_ERROR(status)) - mlme_legacy_err("unable to unregister psoc destroy handle"); - - status = wlan_objmgr_unregister_psoc_create_handler( - WLAN_UMAC_COMP_MLME, - mlme_psoc_object_created_notification, - NULL); - - if (status != QDF_STATUS_SUCCESS) - mlme_legacy_err("unable to unregister psoc create handle"); - return status; } @@ -215,11 +182,11 @@ static uint32_t ucfg_mlme_convert_power_cfg_chan_to_freq( void ucfg_mlme_cfg_chan_to_freq(struct wlan_objmgr_pdev *pdev) { struct wlan_objmgr_psoc *psoc = wlan_pdev_get_psoc(pdev); - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; struct wlan_mlme_cfg *mlme_cfg; uint32_t converted_data_len = 0; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return; @@ -257,9 +224,9 @@ QDF_STATUS ucfg_mlme_get_sta_keep_alive_period(struct wlan_objmgr_psoc *psoc, uint32_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_INFRA_STA_KEEP_ALIVE_PERIOD); return QDF_STATUS_E_INVAL; @@ -274,9 +241,9 @@ QDF_STATUS ucfg_mlme_get_dfs_master_capability(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_ENABLE_DFS_MASTER_CAPABILITY); return QDF_STATUS_E_INVAL; @@ -291,9 +258,9 @@ QDF_STATUS ucfg_mlme_get_fine_time_meas_cap(struct wlan_objmgr_psoc *psoc, uint32_t *fine_time_meas_cap) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *fine_time_meas_cap = cfg_default(CFG_FINE_TIME_MEAS_CAPABILITY); @@ -309,9 +276,9 @@ QDF_STATUS ucfg_mlme_set_fine_time_meas_cap(struct wlan_objmgr_psoc *psoc, uint32_t fine_time_meas_cap) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -324,9 +291,9 @@ QDF_STATUS ucfg_mlme_get_dfs_disable_channel_switch(struct wlan_objmgr_psoc *psoc, bool *dfs_disable_channel_switch) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *dfs_disable_channel_switch = cfg_default(CFG_DISABLE_DFS_CH_SWITCH); @@ -343,9 +310,9 @@ QDF_STATUS ucfg_mlme_set_dfs_disable_channel_switch(struct wlan_objmgr_psoc *psoc, bool dfs_disable_channel_switch) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { return QDF_STATUS_E_INVAL; } @@ -360,9 +327,9 @@ QDF_STATUS ucfg_mlme_get_dfs_ignore_cac(struct wlan_objmgr_psoc *psoc, bool *dfs_ignore_cac) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *dfs_ignore_cac = cfg_default(CFG_IGNORE_CAC); return QDF_STATUS_E_INVAL; @@ -377,9 +344,9 @@ QDF_STATUS ucfg_mlme_set_dfs_ignore_cac(struct wlan_objmgr_psoc *psoc, bool dfs_ignore_cac) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -392,9 +359,9 @@ QDF_STATUS ucfg_mlme_get_sap_tx_leakage_threshold(struct wlan_objmgr_psoc *psoc, uint32_t *sap_tx_leakage_threshold) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *sap_tx_leakage_threshold = cfg_default(CFG_SAP_TX_LEAKAGE_THRESHOLD); @@ -411,9 +378,9 @@ QDF_STATUS ucfg_mlme_set_sap_tx_leakage_threshold(struct wlan_objmgr_psoc *psoc, uint32_t sap_tx_leakage_threshold) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -427,9 +394,9 @@ QDF_STATUS ucfg_mlme_get_dfs_pri_multiplier(struct wlan_objmgr_psoc *psoc, uint32_t *dfs_pri_multiplier) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *dfs_pri_multiplier = cfg_default(CFG_DFS_RADAR_PRI_MULTIPLIER); @@ -446,9 +413,9 @@ QDF_STATUS ucfg_mlme_set_dfs_pri_multiplier(struct wlan_objmgr_psoc *psoc, uint32_t dfs_pri_multiplier) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -462,9 +429,9 @@ QDF_STATUS ucfg_mlme_get_dfs_filter_offload(struct wlan_objmgr_psoc *psoc, bool *dfs_filter_offload) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *dfs_filter_offload = cfg_default(CFG_ENABLE_DFS_PHYERR_FILTEROFFLOAD); @@ -480,9 +447,9 @@ QDF_STATUS ucfg_mlme_set_dfs_filter_offload(struct wlan_objmgr_psoc *psoc, bool dfs_filter_offload) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -495,9 +462,9 @@ QDF_STATUS ucfg_mlme_get_pmkid_modes(struct wlan_objmgr_psoc *psoc, uint32_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_PMKID_MODES); return QDF_STATUS_E_INVAL; @@ -512,9 +479,9 @@ QDF_STATUS ucfg_mlme_set_pmkid_modes(struct wlan_objmgr_psoc *psoc, uint32_t val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -527,9 +494,9 @@ QDF_STATUS ucfg_mlme_get_twt_requestor(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_TWT_REQUESTOR); return QDF_STATUS_E_INVAL; @@ -544,9 +511,9 @@ QDF_STATUS ucfg_mlme_set_twt_requestor(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -559,9 +526,9 @@ QDF_STATUS ucfg_mlme_get_twt_responder(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_TWT_RESPONDER); return QDF_STATUS_E_INVAL; @@ -576,9 +543,9 @@ QDF_STATUS ucfg_mlme_set_twt_responder(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -591,9 +558,9 @@ QDF_STATUS ucfg_mlme_get_bcast_twt(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_BCAST_TWT); return QDF_STATUS_E_INVAL; @@ -608,9 +575,9 @@ QDF_STATUS ucfg_mlme_set_bcast_twt(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -623,9 +590,9 @@ QDF_STATUS ucfg_mlme_get_twt_congestion_timeout(struct wlan_objmgr_psoc *psoc, uint32_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_TWT_CONGESTION_TIMEOUT); return QDF_STATUS_E_INVAL; @@ -640,9 +607,9 @@ QDF_STATUS ucfg_mlme_set_twt_congestion_timeout(struct wlan_objmgr_psoc *psoc, uint32_t val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -655,9 +622,9 @@ QDF_STATUS ucfg_mlme_get_enable_twt(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_ENABLE_TWT); return QDF_STATUS_E_INVAL; @@ -672,9 +639,9 @@ QDF_STATUS ucfg_mlme_set_enable_twt(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -687,9 +654,9 @@ QDF_STATUS ucfg_mlme_get_dot11p_mode(struct wlan_objmgr_psoc *psoc, enum dot11p_mode *out_mode) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *out_mode = cfg_default(CFG_DOT11P_MODE); return QDF_STATUS_E_INVAL; @@ -704,9 +671,9 @@ QDF_STATUS ucfg_mlme_get_go_cts2self_for_sta(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_ENABLE_GO_CTS2SELF_FOR_STA); return QDF_STATUS_E_INVAL; @@ -721,9 +688,9 @@ QDF_STATUS ucfg_mlme_get_force_rsne_override(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_FORCE_RSNE_OVERRIDE); return QDF_STATUS_E_INVAL; @@ -738,9 +705,9 @@ QDF_STATUS ucfg_mlme_get_qcn_ie_support(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_QCN_IE_SUPPORT); return QDF_STATUS_E_INVAL; @@ -755,9 +722,9 @@ QDF_STATUS ucfg_mlme_get_tgt_gtx_usr_cfg(struct wlan_objmgr_psoc *psoc, uint32_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_TGT_GTX_USR_CFG); return QDF_STATUS_E_INVAL; @@ -771,9 +738,9 @@ ucfg_mlme_get_tgt_gtx_usr_cfg(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_mlme_is_override_ht20_40_24g(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_OBSS_HT40_OVERRIDE_HT40_20_24GHZ); return QDF_STATUS_E_INVAL; @@ -788,9 +755,9 @@ QDF_STATUS ucfg_mlme_get_roaming_offload(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR3_ROAMING_OFFLOAD); return QDF_STATUS_E_INVAL; @@ -805,9 +772,9 @@ QDF_STATUS ucfg_mlme_set_roaming_offload(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -821,9 +788,9 @@ QDF_STATUS ucfg_mlme_get_first_scan_bucket_threshold(struct wlan_objmgr_psoc *psoc, uint8_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_FIRST_SCAN_BUCKET_THRESHOLD); return QDF_STATUS_E_INVAL; @@ -837,9 +804,9 @@ ucfg_mlme_get_first_scan_bucket_threshold(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_mlme_is_mawc_enabled(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_MAWC_FEATURE_ENABLED); return QDF_STATUS_E_INVAL; @@ -852,9 +819,9 @@ ucfg_mlme_is_mawc_enabled(struct wlan_objmgr_psoc *psoc, bool *val) QDF_STATUS ucfg_mlme_set_mawc_enabled(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -867,9 +834,9 @@ QDF_STATUS ucfg_mlme_is_fast_transition_enabled(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_FAST_TRANSITION_ENABLED); return QDF_STATUS_E_INVAL; @@ -884,9 +851,9 @@ QDF_STATUS ucfg_mlme_set_fast_transition_enabled(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -900,9 +867,9 @@ QDF_STATUS ucfg_mlme_set_tgt_adaptive_11r_cap(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -916,9 +883,9 @@ QDF_STATUS ucfg_mlme_is_roam_scan_offload_enabled(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_ROAM_SCAN_OFFLOAD_ENABLED); return QDF_STATUS_E_INVAL; @@ -933,9 +900,9 @@ QDF_STATUS ucfg_mlme_set_roam_scan_offload_enabled(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -948,9 +915,9 @@ QDF_STATUS ucfg_mlme_get_neighbor_scan_max_chan_time(struct wlan_objmgr_psoc *psoc, uint16_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_NEIGHBOR_SCAN_MAX_CHAN_TIME); return QDF_STATUS_E_INVAL; @@ -965,9 +932,9 @@ QDF_STATUS ucfg_mlme_get_neighbor_scan_min_chan_time(struct wlan_objmgr_psoc *psoc, uint16_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_NEIGHBOR_SCAN_MIN_CHAN_TIME); return QDF_STATUS_E_INVAL; @@ -982,9 +949,9 @@ QDF_STATUS ucfg_mlme_get_delay_before_vdev_stop(struct wlan_objmgr_psoc *psoc, uint8_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_DELAY_BEFORE_VDEV_STOP); return QDF_STATUS_E_INVAL; @@ -999,9 +966,9 @@ QDF_STATUS ucfg_mlme_get_roam_bmiss_final_bcnt(struct wlan_objmgr_psoc *psoc, uint8_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_ROAM_BMISS_FINAL_BCNT); return QDF_STATUS_E_INVAL; @@ -1016,9 +983,9 @@ QDF_STATUS ucfg_mlme_get_roam_bmiss_first_bcnt(struct wlan_objmgr_psoc *psoc, uint8_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_ROAM_BMISS_FIRST_BCNT); return QDF_STATUS_E_INVAL; @@ -1032,9 +999,9 @@ ucfg_mlme_get_roam_bmiss_first_bcnt(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_mlme_is_lfr_enabled(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_FEATURE_ENABLED); return QDF_STATUS_E_INVAL; @@ -1048,9 +1015,9 @@ ucfg_mlme_is_lfr_enabled(struct wlan_objmgr_psoc *psoc, bool *val) QDF_STATUS ucfg_mlme_set_lfr_enabled(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1062,9 +1029,9 @@ ucfg_mlme_set_lfr_enabled(struct wlan_objmgr_psoc *psoc, bool val) QDF_STATUS ucfg_mlme_is_roam_prefer_5ghz(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_ROAM_PREFER_5GHZ); return QDF_STATUS_E_INVAL; @@ -1078,9 +1045,9 @@ ucfg_mlme_is_roam_prefer_5ghz(struct wlan_objmgr_psoc *psoc, bool *val) QDF_STATUS ucfg_mlme_set_roam_intra_band(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1092,9 +1059,9 @@ ucfg_mlme_set_roam_intra_band(struct wlan_objmgr_psoc *psoc, bool val) QDF_STATUS ucfg_mlme_get_home_away_time(struct wlan_objmgr_psoc *psoc, uint16_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_ROAM_SCAN_HOME_AWAY_TIME); return QDF_STATUS_E_INVAL; @@ -1109,9 +1076,9 @@ QDF_STATUS ucfg_mlme_set_fast_roam_in_concurrency_enabled(struct wlan_objmgr_psoc *psoc, bool val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1124,9 +1091,9 @@ ucfg_mlme_set_fast_roam_in_concurrency_enabled(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_mlme_is_ese_enabled(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR_ESE_FEATURE_ENABLED); return QDF_STATUS_E_INVAL; @@ -1142,9 +1109,9 @@ QDF_STATUS ucfg_mlme_get_opr_rate_set(struct wlan_objmgr_psoc *psoc, uint8_t *buf, qdf_size_t *len) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1156,9 +1123,9 @@ QDF_STATUS ucfg_mlme_get_ext_opr_rate_set(struct wlan_objmgr_psoc *psoc, uint8_t *buf, qdf_size_t *len) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1170,9 +1137,9 @@ QDF_STATUS ucfg_mlme_get_supported_mcs_set(struct wlan_objmgr_psoc *psoc, uint8_t *buf, qdf_size_t *len) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1185,9 +1152,9 @@ QDF_STATUS ucfg_mlme_set_supported_mcs_set(struct wlan_objmgr_psoc *psoc, uint8_t *buf, qdf_size_t len) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1200,9 +1167,9 @@ QDF_STATUS ucfg_mlme_get_current_mcs_set(struct wlan_objmgr_psoc *psoc, uint8_t *buf, qdf_size_t *len) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1215,9 +1182,9 @@ QDF_STATUS ucfg_mlme_get_wmi_wq_watchdog_timeout(struct wlan_objmgr_psoc *psoc, uint32_t *wmi_wq_watchdog_timeout) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *wmi_wq_watchdog_timeout = cfg_default(CFG_WMI_WQ_WATCHDOG); return QDF_STATUS_E_INVAL; @@ -1233,9 +1200,9 @@ QDF_STATUS ucfg_mlme_set_wmi_wq_watchdog_timeout(struct wlan_objmgr_psoc *psoc, uint32_t wmi_wq_watchdog_timeout) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1255,9 +1222,9 @@ QDF_STATUS ucfg_mlme_stats_get_periodic_display_time(struct wlan_objmgr_psoc *psoc, uint32_t *periodic_display_time) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *periodic_display_time = cfg_default(CFG_PERIODIC_STATS_DISPLAY_TIME); @@ -1277,9 +1244,9 @@ ucfg_mlme_stats_get_cfg_values(struct wlan_objmgr_psoc *psoc, int *link_speed_rssi_low, uint32_t *link_speed_rssi_report) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *link_speed_rssi_high = cfg_default(CFG_LINK_SPEED_RSSI_HIGH); @@ -1306,10 +1273,10 @@ ucfg_mlme_stats_get_cfg_values(struct wlan_objmgr_psoc *psoc, bool ucfg_mlme_stats_is_link_speed_report_actual(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; int report_link_speed = 0; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) report_link_speed = cfg_default(CFG_REPORT_MAX_LINK_SPEED); else @@ -1321,10 +1288,10 @@ bool ucfg_mlme_stats_is_link_speed_report_actual(struct wlan_objmgr_psoc *psoc) bool ucfg_mlme_stats_is_link_speed_report_max(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; int report_link_speed = 0; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) report_link_speed = cfg_default(CFG_REPORT_MAX_LINK_SPEED); else @@ -1337,10 +1304,10 @@ bool ucfg_mlme_stats_is_link_speed_report_max(struct wlan_objmgr_psoc *psoc) bool ucfg_mlme_stats_is_link_speed_report_max_scaled(struct wlan_objmgr_psoc *psoc) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; int report_link_speed = 0; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) report_link_speed = cfg_default(CFG_REPORT_MAX_LINK_SPEED); else @@ -1354,9 +1321,9 @@ QDF_STATUS ucfg_mlme_get_ps_data_inactivity_timeout(struct wlan_objmgr_psoc *psoc, uint32_t *inactivity_timeout) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *inactivity_timeout = cfg_default(CFG_PS_DATA_INACTIVITY_TIMEOUT); @@ -1371,9 +1338,9 @@ QDF_STATUS ucfg_mlme_set_ps_data_inactivity_timeout(struct wlan_objmgr_psoc *psoc, uint32_t inactivity_timeout) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1391,9 +1358,9 @@ QDF_STATUS ucfg_mlme_get_sta_keepalive_method(struct wlan_objmgr_psoc *psoc, enum station_keepalive_method *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1405,9 +1372,9 @@ QDF_STATUS ucfg_mlme_get_enable_deauth_to_disassoc_map(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1420,9 +1387,9 @@ QDF_STATUS ucfg_mlme_get_ap_random_bssid_enable(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1433,9 +1400,9 @@ ucfg_mlme_get_ap_random_bssid_enable(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_mlme_get_latency_enable(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { mlme_legacy_err("mlme obj null"); return QDF_STATUS_E_INVAL; @@ -1448,12 +1415,12 @@ ucfg_mlme_get_latency_enable(struct wlan_objmgr_psoc *psoc, bool *value) QDF_STATUS ucfg_mlme_get_ibss_cfg(struct wlan_objmgr_psoc *psoc, struct wlan_mlme_ibss_cfg *ibss_cfg) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; if (!ibss_cfg) return QDF_STATUS_E_FAILURE; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { mlme_legacy_err("MLME Obj null on get IBSS config"); mlme_init_ibss_cfg(psoc, ibss_cfg); @@ -1466,9 +1433,9 @@ QDF_STATUS ucfg_mlme_get_ibss_cfg(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_mlme_set_ibss_auto_bssid(struct wlan_objmgr_psoc *psoc, uint32_t auto_bssid) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { mlme_legacy_err("MLME Obj null on get IBSS config"); return QDF_STATUS_E_INVAL; @@ -1482,9 +1449,9 @@ QDF_STATUS ucfg_mlme_get_mws_coex_4g_quick_tdm(struct wlan_objmgr_psoc *psoc, uint32_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_MWS_COEX_4G_QUICK_FTDM); mlme_legacy_err("mlme obj null"); @@ -1500,9 +1467,9 @@ QDF_STATUS ucfg_mlme_get_mws_coex_5g_nr_pwr_limit(struct wlan_objmgr_psoc *psoc, uint32_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_MWS_COEX_5G_NR_PWR_LIMIT); mlme_legacy_err("mlme obj null"); @@ -1519,9 +1486,9 @@ QDF_STATUS ucfg_mlme_get_etsi13_srd_chan_in_master_mode(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_ETSI13_SRD_CHAN_IN_MASTER_MODE); mlme_legacy_err("Failed to get MLME Obj"); @@ -1538,10 +1505,10 @@ QDF_STATUS ucfg_mlme_get_acs_avoid_freq_list(struct wlan_objmgr_psoc *psoc, uint16_t *freq_list, uint8_t *freq_list_num) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; qdf_size_t avoid_acs_freq_list_num; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { qdf_uint16_array_parse( cfg_default(CFG_SAP_AVOID_ACS_FREQ_LIST), @@ -1565,9 +1532,9 @@ QDF_STATUS ucfg_mlme_get_11d_in_world_mode(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_ENABLE_11D_IN_WORLD_MODE); mlme_legacy_err("Failed to get MLME Obj"); @@ -1583,9 +1550,9 @@ QDF_STATUS ucfg_mlme_get_restart_beaconing_on_ch_avoid(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_RESTART_BEACONING_ON_CH_AVOID); mlme_legacy_err("Failed to get MLME Obj"); @@ -1601,9 +1568,9 @@ QDF_STATUS ucfg_mlme_get_indoor_channel_support(struct wlan_objmgr_psoc *psoc, bool *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_INDOOR_CHANNEL_SUPPORT); mlme_legacy_err("Failed to get MLME Obj"); @@ -1619,9 +1586,9 @@ QDF_STATUS ucfg_mlme_get_scan_11d_interval(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_SCAN_11D_INTERVAL); mlme_legacy_err("Failed to get MLME Obj"); @@ -1637,13 +1604,13 @@ ucfg_mlme_get_valid_channel_freq_list(struct wlan_objmgr_psoc *psoc, uint32_t *channel_list, uint32_t *channel_list_num) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; qdf_size_t valid_channel_list_num = 0; uint8_t tmp_channel_list[CFG_VALID_CHANNEL_LIST_LEN]; uint8_t i; struct wlan_objmgr_pdev *pdev = NULL; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { qdf_uint8_array_parse(cfg_default(CFG_VALID_CHANNEL_LIST), tmp_channel_list, @@ -1678,9 +1645,9 @@ ucfg_mlme_get_valid_channel_freq_list(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_mlme_is_subnet_detection_enabled(struct wlan_objmgr_psoc *psoc, bool *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_LFR3_ENABLE_SUBNET_DETECTION); return QDF_STATUS_E_INVAL; @@ -1695,9 +1662,9 @@ QDF_STATUS ucfg_mlme_set_current_tx_power_level(struct wlan_objmgr_psoc *psoc, uint8_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1710,9 +1677,9 @@ QDF_STATUS ucfg_mlme_get_current_tx_power_level(struct wlan_objmgr_psoc *psoc, uint8_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_CURRENT_TX_POWER_LEVEL); return QDF_STATUS_E_INVAL; @@ -1727,9 +1694,9 @@ QDF_STATUS ucfg_mlme_set_obss_detection_offload_enabled(struct wlan_objmgr_psoc *psoc, uint8_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1742,9 +1709,9 @@ QDF_STATUS ucfg_mlme_set_obss_color_collision_offload_enabled( struct wlan_objmgr_psoc *psoc, uint8_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1757,9 +1724,9 @@ QDF_STATUS ucfg_mlme_get_channel_bonding_24ghz(struct wlan_objmgr_psoc *psoc, uint32_t *val) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_CHANNEL_BONDING_MODE_24GHZ); return QDF_STATUS_E_INVAL; @@ -1773,9 +1740,9 @@ QDF_STATUS ucfg_mlme_set_channel_bonding_24ghz(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; @@ -1788,9 +1755,9 @@ QDF_STATUS ucfg_mlme_get_channel_bonding_5ghz(struct wlan_objmgr_psoc *psoc, uint32_t *value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_CHANNEL_BONDING_MODE_5GHZ); return QDF_STATUS_E_INVAL; @@ -1804,9 +1771,9 @@ QDF_STATUS ucfg_mlme_set_channel_bonding_5ghz(struct wlan_objmgr_psoc *psoc, uint32_t value) { - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_obj; - mlme_obj = mlme_get_psoc_obj(psoc); + mlme_obj = mlme_get_psoc_ext_obj(psoc); if (!mlme_obj) return QDF_STATUS_E_INVAL; diff --git a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c index a55201dbbc50..379575e4e548 100644 --- a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c +++ b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c @@ -34,6 +34,7 @@ #include "sys_entry_func.h" #include "mac_init_api.h" #include "wlan_mlme_main.h" +#include "wlan_psoc_mlme_api.h" #ifdef TRACE_RECORD #include "mac_trace.h" @@ -101,7 +102,7 @@ QDF_STATUS mac_open(struct wlan_objmgr_psoc *psoc, mac_handle_t *mac_handle, { struct mac_context *mac; QDF_STATUS status; - struct wlan_mlme_psoc_obj *mlme_obj; + struct wlan_mlme_psoc_ext_obj *mlme_ext_obj; QDF_BUG(mac_handle); if (!mac_handle) @@ -125,13 +126,13 @@ QDF_STATUS mac_open(struct wlan_objmgr_psoc *psoc, mac_handle_t *mac_handle, } mac->psoc = psoc; - mlme_obj = mlme_get_psoc_obj(psoc); - if (!mlme_obj) { + mlme_ext_obj = wlan_psoc_mlme_get_ext_hdl(psoc); + if (!mlme_ext_obj) { pe_err("Failed to get MLME Obj"); status = QDF_STATUS_E_FAILURE; goto release_psoc_ref; } - mac->mlme_cfg = &mlme_obj->cfg; + mac->mlme_cfg = &mlme_ext_obj->cfg; *mac_handle = MAC_HANDLE(mac);