qcacmn: VDEV MLME component changes

1) replace legacy string with ext
2) Added new compile CMN_VDEV_MLME_CMPT_ENABLE macro for
   VDEV MLME component

Change-Id: I75fc7cbae9c437d60e666f0c188fb63e98fdac3b
CRs-Fixed: 2307722
This commit is contained in:
Srinivas Pitla
2018-12-03 17:36:47 +05:30
committed by nshrivas
父節點 79cdf64d70
當前提交 d3a3c544bf
共有 5 個文件被更改,包括 58 次插入53 次删除

查看文件

@@ -136,26 +136,6 @@ enum wlan_vdev_sm_evt {
WLAN_VDEV_SM_EV_ROAM = 28,
};
/**
* wlan_vdev_mlme_init - Initializes MLME component
*
* Registers callbacks with object manager for create/destroy
*
* Return: SUCCESS on successful registration
* FAILURE, if registration fails
*/
QDF_STATUS wlan_vdev_mlme_init(void);
/**
* wlan_vdev_mlme_deinit - Uninitializes MLME component
*
* Unregisters callbacks with object manager for create/destroy
*
* Return: SUCCESS on successful registration
* FAILURE, if registration fails
*/
QDF_STATUS wlan_vdev_mlme_deinit(void);
#else
/**
@@ -179,6 +159,31 @@ enum wlan_vdev_state {
WLAN_VDEV_S_RESET = 6,
WLAN_VDEV_S_MAX,
};
#endif
#ifdef CMN_VDEV_MLME_CMPT_ENABLE
/**
* wlan_vdev_mlme_init - Initializes MLME component
*
* Registers callbacks with object manager for create/destroy
*
* Return: SUCCESS on successful registration
* FAILURE, if registration fails
*/
QDF_STATUS wlan_vdev_mlme_init(void);
/**
* wlan_vdev_mlme_deinit - Uninitializes MLME component
*
* Unregisters callbacks with object manager for create/destroy
*
* Return: SUCCESS on successful registration
* FAILURE, if registration fails
*/
QDF_STATUS wlan_vdev_mlme_deinit(void);
#else
/**
* wlan_vdev_mlme_init - Initializes MLME component

查看文件

@@ -63,9 +63,9 @@ static QDF_STATUS mlme_vdev_obj_create_handler(struct wlan_objmgr_vdev *vdev,
goto init_failed;
}
if (mlme_vdev_legacy_hdl_create(vdev_mlme) != QDF_STATUS_SUCCESS) {
if (mlme_vdev_ext_hdl_create(vdev_mlme) != QDF_STATUS_SUCCESS) {
mlme_err("Legacy vdev object creation failed");
goto legacy_hdl_create_failed;
goto ext_hdl_create_failed;
}
wlan_objmgr_vdev_component_obj_attach((struct wlan_objmgr_vdev *)vdev,
@@ -73,18 +73,18 @@ static QDF_STATUS mlme_vdev_obj_create_handler(struct wlan_objmgr_vdev *vdev,
(void *)vdev_mlme,
QDF_STATUS_SUCCESS);
if (mlme_vdev_legacy_hdl_post_create(vdev_mlme) != QDF_STATUS_SUCCESS) {
if (mlme_vdev_ext_hdl_post_create(vdev_mlme) != QDF_STATUS_SUCCESS) {
mlme_err("Legacy vdev object post creation failed");
goto legacy_hdl_post_create_failed;
goto ext_hdl_post_create_failed;
}
return QDF_STATUS_SUCCESS;
legacy_hdl_post_create_failed:
mlme_vdev_legacy_hdl_destroy(vdev_mlme);
ext_hdl_post_create_failed:
mlme_vdev_ext_hdl_destroy(vdev_mlme);
wlan_objmgr_vdev_component_obj_detach(vdev, WLAN_UMAC_COMP_MLME,
vdev_mlme);
legacy_hdl_create_failed:
ext_hdl_create_failed:
mlme_vdev_sm_destroy(vdev_mlme);
init_failed:
qdf_mem_free(vdev_mlme);
@@ -111,7 +111,7 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev,
mlme_vdev_sm_destroy(vdev_mlme);
mlme_vdev_legacy_hdl_destroy(vdev_mlme);
mlme_vdev_ext_hdl_destroy(vdev_mlme);
wlan_objmgr_vdev_component_obj_detach(vdev, WLAN_UMAC_COMP_MLME,
vdev_mlme);