diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h index 7a1d4ec3c5..3f398e3d66 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h @@ -1325,7 +1325,6 @@ static inline enum wlan_vdev_state wlan_vdev_mlme_get_state( return vdev->vdev_mlme.mlme_state; } -#ifdef CMN_VDEV_MLME_SM_ENABLE /** * wlan_vdev_mlme_get_substate() - get mlme substate * @vdev: VDEV object @@ -1339,23 +1338,6 @@ static inline enum wlan_vdev_state wlan_vdev_mlme_get_substate( { return vdev->vdev_mlme.mlme_substate; } -#else -/** - * wlan_vdev_mlme_set_state() - set mlme state - * @vdev: VDEV object - * @state: MLME state - * - * API to set MLME state - * - * Return: void - */ -static inline void wlan_vdev_mlme_set_state(struct wlan_objmgr_vdev *vdev, - enum wlan_vdev_state state) -{ - if (state < WLAN_VDEV_S_MAX) - vdev->vdev_mlme.mlme_state = state; -} -#endif /** * wlan_vdev_set_selfpeer() - set self peer diff --git a/umac/cmn_services/utils/inc/wlan_utility.h b/umac/cmn_services/utils/inc/wlan_utility.h index 9428f217ec..bdc80be57e 100644 --- a/umac/cmn_services/utils/inc/wlan_utility.h +++ b/umac/cmn_services/utils/inc/wlan_utility.h @@ -32,7 +32,6 @@ #define TGT_IS_VALID_SNR(x) ((x) >= 0 && (x) < TGT_MAX_SNR) #define TGT_IS_VALID_RSSI(x) ((x) != 0xFF) -#ifdef CMN_VDEV_MLME_SM_ENABLE /** * struct wlan_vdev_ch_check_filter - vdev chan check filter object * @flag: matches or not @@ -42,7 +41,6 @@ struct wlan_vdev_ch_check_filter { uint8_t flag; struct wlan_objmgr_vdev *vdev; }; -#endif /** * struct wlan_peer_count- vdev connected peer count diff --git a/umac/cmn_services/utils/src/wlan_utility.c b/umac/cmn_services/utils/src/wlan_utility.c index aeed7e8efc..318d62baab 100644 --- a/umac/cmn_services/utils/src/wlan_utility.c +++ b/umac/cmn_services/utils/src/wlan_utility.c @@ -183,7 +183,6 @@ uint32_t wlan_get_pdev_id_from_vdev_id(struct wlan_objmgr_psoc *psoc, } qdf_export_symbol(wlan_get_pdev_id_from_vdev_id); -#ifdef CMN_VDEV_MLME_SM_ENABLE static void wlan_vdev_active(struct wlan_objmgr_pdev *pdev, void *object, void *arg) { @@ -201,38 +200,7 @@ QDF_STATUS wlan_vdev_is_up(struct wlan_objmgr_vdev *vdev) { return wlan_vdev_allow_connect_n_tx(vdev); } - qdf_export_symbol(wlan_vdev_is_up); -#else -static void wlan_vdev_active(struct wlan_objmgr_pdev *pdev, void *object, - void *arg) -{ - struct wlan_objmgr_vdev *vdev = (struct wlan_objmgr_vdev *)object; - uint8_t *flag = (uint8_t *)arg; - - wlan_vdev_obj_lock(vdev); - if ((wlan_vdev_mlme_get_state(vdev) == WLAN_VDEV_S_RUN) || - (wlan_vdev_mlme_get_state(vdev) == WLAN_VDEV_S_DFS_WAIT)) - *flag = 1; - - wlan_vdev_obj_unlock(vdev); -} - -QDF_STATUS wlan_vdev_is_up(struct wlan_objmgr_vdev *vdev) -{ - QDF_STATUS is_up = QDF_STATUS_E_FAILURE; - - wlan_vdev_obj_lock(vdev); - if (wlan_vdev_mlme_get_state(vdev) == WLAN_VDEV_S_RUN) - is_up = QDF_STATUS_SUCCESS; - - wlan_vdev_obj_unlock(vdev); - - return is_up; -} - -qdf_export_symbol(wlan_vdev_is_up); -#endif QDF_STATUS wlan_util_is_vdev_active(struct wlan_objmgr_pdev *pdev, wlan_objmgr_ref_dbgid dbg_id) @@ -253,7 +221,6 @@ QDF_STATUS wlan_util_is_vdev_active(struct wlan_objmgr_pdev *pdev, qdf_export_symbol(wlan_util_is_vdev_active); -#ifdef CMN_VDEV_MLME_SM_ENABLE void wlan_util_change_map_index(unsigned long *map, uint8_t id, uint8_t set) { if (set) @@ -479,13 +446,6 @@ QDF_STATUS wlan_util_is_pdev_scan_allowed(struct wlan_objmgr_pdev *pdev, return QDF_STATUS_SUCCESS; } -#else -QDF_STATUS wlan_util_is_pdev_scan_allowed(struct wlan_objmgr_pdev *pdev, - wlan_objmgr_ref_dbgid dbg_id) -{ - return QDF_STATUS_SUCCESS; -} -#endif void wlan_util_stats_get_rssi(bool db2dbm_enabled, int32_t bcn_snr, int32_t dat_snr, diff --git a/umac/mlme/include/wlan_mlme_cmn.h b/umac/mlme/include/wlan_mlme_cmn.h index 721be849a8..eee5f24486 100644 --- a/umac/mlme/include/wlan_mlme_cmn.h +++ b/umac/mlme/include/wlan_mlme_cmn.h @@ -20,7 +20,6 @@ #ifndef _WLAN_MLME_CMN_H_ #define _WLAN_MLME_CMN_H_ -#ifdef CMN_VDEV_MLME_CMPT_ENABLE #include #include @@ -213,16 +212,4 @@ QDF_STATUS wlan_cmn_mlme_init(void); * FAILURE, if registration fails */ QDF_STATUS wlan_cmn_mlme_deinit(void); -#else -static inline QDF_STATUS wlan_cmn_mlme_init(void) -{ - return QDF_STATUS_SUCCESS; -} - -static inline QDF_STATUS wlan_cmn_mlme_deinit(void) -{ - return QDF_STATUS_SUCCESS; -} -#endif - #endif diff --git a/umac/mlme/mlme_objmgr/dispatcher/inc/wlan_vdev_mlme_main.h b/umac/mlme/mlme_objmgr/dispatcher/inc/wlan_vdev_mlme_main.h index 6c0f17f80f..8a89344b2b 100644 --- a/umac/mlme/mlme_objmgr/dispatcher/inc/wlan_vdev_mlme_main.h +++ b/umac/mlme/mlme_objmgr/dispatcher/inc/wlan_vdev_mlme_main.h @@ -36,7 +36,6 @@ wlan_mlme_get_lmac_tx_ops(struct wlan_objmgr_psoc *psoc) return &psoc->soc_cb.tx_ops.mops; } -#ifdef CMN_VDEV_MLME_SM_ENABLE /** * enum wlan_vdev_state - VDEV state * @WLAN_VDEV_S_INIT: Default state, IDLE state @@ -151,33 +150,6 @@ enum wlan_vdev_sm_evt { WLAN_VDEV_SM_EV_STOP_REQ = 29, }; -#else - -/** - * enum wlan_vdev_state - VDEV state - * @WLAN_VDEV_S_INIT: Default state, IDLE state - * @WLAN_VDEV_S_SCAN: SCAN state - * @WLAN_VDEV_S_JOIN: Join state - * @WLAN_VDEV_S_DFS_WAIT:CAC period - * @WLAN_VDEV_S_RUN: RUN state - * @WLAN_VDEV_S_STOP: STOP state - * @WLAN_VDEV_S_RESET: RESET state, STOP+INIT+JOIN - * @WLAN_VDEV_S_MAX: MAX state - */ -enum wlan_vdev_state { - WLAN_VDEV_S_INIT = 0, - WLAN_VDEV_S_SCAN = 1, - WLAN_VDEV_S_JOIN = 2, - WLAN_VDEV_S_DFS_WAIT = 3, - WLAN_VDEV_S_RUN = 4, - WLAN_VDEV_S_STOP = 5, - WLAN_VDEV_S_RESET = 6, - WLAN_VDEV_S_MAX, -}; -#endif - -#ifdef CMN_VDEV_MLME_CMPT_ENABLE - /** * wlan_vdev_mlme_init - Initializes VDEV MLME component * @@ -217,59 +189,4 @@ QDF_STATUS wlan_mlme_psoc_enable(struct wlan_objmgr_psoc *psoc); * FAILURE, if cleanup fails */ QDF_STATUS wlan_mlme_psoc_disable(struct wlan_objmgr_psoc *psoc); -#else - -/** - * wlan_vdev_mlme_init - Initializes MLME component - * - * Registers callbacks with object manager for create/destroy - * - * Return: SUCCESS on successful registration - * FAILURE, if registration fails - */ -static inline QDF_STATUS wlan_vdev_mlme_init(void) -{ - return QDF_STATUS_SUCCESS; -} - -/** - * wlan_vdev_mlme_deinit - Uninitializes MLME component - * - * Unregisters callbacks with object manager for create/destroy - * - * Return: SUCCESS on successful registration - * FAILURE, if registration fails - */ -static inline QDF_STATUS wlan_vdev_mlme_deinit(void) -{ - return QDF_STATUS_SUCCESS; -} - -/** - * wlan_mlme_psoc_enable - MLME initializations on PSOC enable - * - * Initializes MLME params on PSOC eable - * - * Return: SUCCESS on successful initialization - * FAILURE, if initialization fails - */ -static inline QDF_STATUS wlan_mlme_psoc_enable(struct wlan_objmgr_psoc *psoc) -{ - return QDF_STATUS_SUCCESS; -} - -/** - * wlan_mlme_psoc_disable - MLME clean up on PSOC disable - * - * cleanup MLME params on PSOC eable - * - * Return: SUCCESS on successful cleanup - * FAILURE, if cleanup fails - */ -static inline QDF_STATUS wlan_mlme_psoc_disable(struct wlan_objmgr_psoc *psoc) -{ - return QDF_STATUS_SUCCESS; -} - -#endif #endif diff --git a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c index 635505b5f4..b512e6e6d6 100644 --- a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c +++ b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c @@ -24,7 +24,6 @@ #include "include/wlan_vdev_mlme.h" #include "vdev_mlme_sm.h" -#ifdef CMN_VDEV_MLME_SM_ENABLE /** * mlme_vdev_set_state() - set mlme state * @vdev: VDEV object @@ -1904,31 +1903,6 @@ QDF_STATUS mlme_vdev_sm_create(struct vdev_mlme_obj *vdev_mlme) return QDF_STATUS_SUCCESS; } -#else - -QDF_STATUS mlme_vdev_sm_create(struct vdev_mlme_obj *vdev_mlme) -{ - struct wlan_sm *sm; - uint8_t name[WLAN_SM_ENGINE_MAX_NAME]; - - qdf_snprintf(name, sizeof(name), "VDEV%d-MLME", - wlan_vdev_get_id(vdev_mlme->vdev)); - - sm = wlan_sm_create(name, vdev_mlme, 0, NULL, 0, NULL, 0); - if (!sm) { - mlme_err("VDEV MLME SM allocation failed"); - return QDF_STATUS_E_FAILURE; - } - vdev_mlme->sm_hdl = sm; - - mlme_vdev_sm_spinlock_create(vdev_mlme); - - mlme_vdev_cmd_mutex_create(vdev_mlme); - - return QDF_STATUS_SUCCESS; -} -#endif - QDF_STATUS mlme_vdev_sm_destroy(struct vdev_mlme_obj *vdev_mlme) { mlme_vdev_cmd_mutex_destroy(vdev_mlme); diff --git a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h index 2db278a634..22ecfcd71f 100644 --- a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h +++ b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h @@ -23,7 +23,6 @@ #ifndef _VDEV_MLME_SM_H_ #define _VDEV_MLME_SM_H_ -#ifdef CMN_VDEV_MLME_SM_ENABLE /** * mlme_vdev_sm_deliver_event() - Delivers event to VDEV MLME SM * @vdev_mlme: MLME VDEV comp object @@ -246,4 +245,3 @@ static inline void mlme_vdev_cmd_mutex_release(struct vdev_mlme_obj *vdev_mlme) { } #endif -#endif diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mlme_api.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mlme_api.h index 761a95e4b0..4e9c31e0b9 100644 --- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mlme_api.h +++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mlme_api.h @@ -55,7 +55,6 @@ void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl); */ void *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev); -#ifdef CMN_VDEV_MLME_SM_ENABLE /** * wlan_vdev_mlme_sm_deliver_evt() - Delivers event to VDEV MLME SM * @vdev: Object manager VDEV object @@ -209,4 +208,3 @@ void wlan_vdev_mlme_cmd_unlock(struct wlan_objmgr_vdev *vdev); */ QDF_STATUS wlan_vdev_mlme_is_scan_allowed(struct wlan_objmgr_vdev *vdev); #endif -#endif diff --git a/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.c b/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.c index 538ec1c922..d90f44f641 100644 --- a/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.c +++ b/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.c @@ -75,7 +75,6 @@ void *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev) qdf_export_symbol(wlan_vdev_mlme_get_ext_hdl); -#ifdef CMN_VDEV_MLME_SM_ENABLE QDF_STATUS wlan_vdev_mlme_sm_deliver_evt(struct wlan_objmgr_vdev *vdev, enum wlan_vdev_sm_evt event, uint16_t event_data_len, @@ -283,4 +282,3 @@ QDF_STATUS wlan_vdev_mlme_is_scan_allowed(struct wlan_objmgr_vdev *vdev) return QDF_STATUS_E_FAILURE; } -#endif