qcacld-3.0: Cleanup VDEV_SM legacy code

Legacy code of VDEV SM is no more used, hence this cleanup is done.

Change-Id: I8dc649639c4c1afb4ae206a046fe530e172bced9
CRs-Fixed: 2454039

mlme/core/inc/wlan_mlme_main.h

@@ -51,8 +51,6 @@ struct peer_mlme_priv_obj {
 	uint32_t ucast_key_cipher;
 };
 
-#ifdef CONFIG_VDEV_SM
-
 /**
  * enum vdev_assoc_type - VDEV associate/reassociate type
  * @VDEV_ASSOC: associate
@@ -90,48 +88,6 @@ struct mlme_legacy_priv {
 	uint8_t sta_dynamic_oce_value;
 };
 
-#else
-/**
- * struct vdev_mlme_obj - VDEV MLME component object
- * @dynamic_cfg: current configuration of nss, chains for vdev.
- * @ini_cfg: Max configuration of nss, chains supported for vdev.
- * @sta_dynamic_oce_value: Dyanmic oce flags value for sta
- */
-struct vdev_mlme_priv_obj {
-	struct wlan_mlme_nss_chains dynamic_cfg;
-	struct wlan_mlme_nss_chains ini_cfg;
-	uint8_t sta_dynamic_oce_value;
-};
-
-/**
- * mlme_vdev_object_created_notification(): mlme vdev create handler
- * @vdev: vdev which is going to created by objmgr
- * @arg: argument for vdev create handler
- *
- * Register this api with objmgr to detect vdev is created
- *
- * Return: QDF_STATUS status in case of success else return error
- */
-
-QDF_STATUS
-mlme_vdev_object_created_notification(struct wlan_objmgr_vdev *vdev,
-				      void *arg);
-
-/**
- * mlme_vdev_object_destroyed_notification(): mlme vdev delete handler
- * @psoc: vdev which is going to delete by objmgr
- * @arg: argument for vdev delete handler
- *
- * Register this api with objmgr to detect vdev is deleted
- *
- * Return: QDF_STATUS status in case of success else return error
- */
-QDF_STATUS
-mlme_vdev_object_destroyed_notification(struct wlan_objmgr_vdev *vdev,
-					void *arg);
-
-#endif
-
 #ifndef CRYPTO_SET_KEY_CONVERGED
 /**
  * wlan_peer_set_unicast_cipher() - set unicast cipher

mlme/core/inc/wlan_mlme_vdev_mgr_interface.h

@@ -22,7 +22,6 @@
 #ifndef _WLAN_MLME_VDEV_MGR_INT_API_H_
 #define _WLAN_MLME_VDEV_MGR_INT_API_H_
 
-#ifdef CONFIG_VDEV_SM
 #include <wlan_objmgr_vdev_obj.h>
 #include "include/wlan_vdev_mlme.h"
 #include "wlan_mlme_main.h"
@@ -196,4 +195,3 @@ QDF_STATUS mlme_set_assoc_type(struct wlan_objmgr_vdev *vdev,
  */
 enum vdev_assoc_type  mlme_get_assoc_type(struct wlan_objmgr_vdev *vdev);
 #endif
-#endif

mlme/core/src/wlan_mlme_main.c

@@ -44,7 +44,6 @@ struct wlan_mlme_psoc_obj *mlme_get_psoc_obj_fl(struct wlan_objmgr_psoc *psoc,
 	return mlme_obj;
 }
 
-#ifdef CONFIG_VDEV_SM
 struct wlan_mlme_nss_chains *mlme_get_dynamic_vdev_config(
 				struct wlan_objmgr_vdev *vdev)
 {
@@ -95,131 +94,6 @@ uint8_t *mlme_get_dynamic_oce_flags(struct wlan_objmgr_vdev *vdev)
 	return &mlme_priv->sta_dynamic_oce_value;
 }
 
-#else
-
-static struct vdev_mlme_priv_obj *
-wlan_vdev_mlme_get_priv_obj(struct wlan_objmgr_vdev *vdev)
-{
-	struct vdev_mlme_priv_obj *vdev_mlme;
-
-	if (!vdev) {
-		mlme_legacy_err("vdev is NULL");
-		return NULL;
-	}
-
-	vdev_mlme = wlan_objmgr_vdev_get_comp_private_obj(vdev,
-							  WLAN_UMAC_COMP_MLME);
-	if (!vdev_mlme) {
-		mlme_legacy_err(" MLME component object is NULL");
-		return NULL;
-	}
-
-	return vdev_mlme;
-}
-
-uint8_t *mlme_get_dynamic_oce_flags(struct wlan_objmgr_vdev *vdev)
-{
-	struct vdev_mlme_priv_obj *vdev_mlme;
-
-	vdev_mlme = wlan_vdev_mlme_get_priv_obj(vdev);
-	if (!vdev_mlme) {
-		mlme_legacy_err("vdev component object is NULL");
-		return NULL;
-	}
-
-	return &vdev_mlme->sta_dynamic_oce_value;
-}
-
-struct wlan_mlme_nss_chains *mlme_get_dynamic_vdev_config(
-				struct wlan_objmgr_vdev *vdev)
-{
-	struct vdev_mlme_priv_obj *vdev_mlme;
-
-	vdev_mlme = wlan_vdev_mlme_get_priv_obj(vdev);
-	if (!vdev_mlme) {
-		mlme_legacy_err("vdev component object is NULL");
-		return NULL;
-	}
-
-	return &vdev_mlme->dynamic_cfg;
-}
-
-struct wlan_mlme_nss_chains *mlme_get_ini_vdev_config(
-				struct wlan_objmgr_vdev *vdev)
-{
-	struct vdev_mlme_priv_obj *vdev_mlme;
-
-	vdev_mlme = wlan_vdev_mlme_get_priv_obj(vdev);
-	if (!vdev_mlme) {
-		mlme_legacy_err("vdev component object is NULL");
-		return NULL;
-	}
-
-	return &vdev_mlme->ini_cfg;
-}
-
-QDF_STATUS
-mlme_vdev_object_created_notification(struct wlan_objmgr_vdev *vdev,
-				      void *arg)
-{
-	struct vdev_mlme_priv_obj *vdev_mlme;
-	QDF_STATUS status;
-
-	if (!vdev) {
-		mlme_legacy_err(" VDEV is NULL");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	vdev_mlme = qdf_mem_malloc(sizeof(*vdev_mlme));
-	if (!vdev_mlme) {
-		mlme_legacy_err(" MLME component object alloc failed");
-		return QDF_STATUS_E_NOMEM;
-	}
-
-	status = wlan_objmgr_vdev_component_obj_attach(vdev,
-						       WLAN_UMAC_COMP_MLME,
-						       (void *)vdev_mlme,
-						       QDF_STATUS_SUCCESS);
-
-	if (QDF_IS_STATUS_ERROR(status))
-		mlme_legacy_err("unable to attach vdev priv obj to vdev obj");
-
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS
-mlme_vdev_object_destroyed_notification(struct wlan_objmgr_vdev *vdev,
-					void *arg)
-{
-	struct vdev_mlme_priv_obj *vdev_mlme;
-	QDF_STATUS status;
-
-	if (!vdev) {
-		mlme_legacy_err(" VDEV is NULL");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	vdev_mlme = wlan_objmgr_vdev_get_comp_private_obj(vdev,
-							  WLAN_UMAC_COMP_MLME);
-	if (!vdev_mlme) {
-		mlme_legacy_err(" VDEV MLME component object is NULL");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	status = wlan_objmgr_vdev_component_obj_detach(vdev,
-						       WLAN_UMAC_COMP_MLME,
-						       vdev_mlme);
-
-	if (QDF_IS_STATUS_ERROR(status))
-		mlme_legacy_err("unable to detach vdev priv obj to vdev obj");
-
-	qdf_mem_free(vdev_mlme);
-
-	return QDF_STATUS_SUCCESS;
-}
-
-#endif
-
 QDF_STATUS
 mlme_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc,
 				      void *arg)

mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -68,7 +68,6 @@ QDF_STATUS ucfg_mlme_psoc_open(struct wlan_objmgr_psoc *psoc);
  */
 void ucfg_mlme_psoc_close(struct wlan_objmgr_psoc *psoc);
 
-#ifdef CONFIG_VDEV_SM
 /**
  * ucfg_mlme_pdev_open() - MLME component pdev Open
  * @pdev: pointer to pdev object
@@ -101,53 +100,6 @@ QDF_STATUS ucfg_mlme_global_init(void);
  * Return: QDF Status
  */
 QDF_STATUS ucfg_mlme_global_deinit(void);
-#else
-/**
- * ucfg_mlme_pdev_open() - MLME component pdev Open
- * @pdev: pointer to pdev object
- *
- * Open the MLME component and initialize the MLME pdev strucutre
- *
- * Return: QDF Status
- */
-static inline QDF_STATUS ucfg_mlme_pdev_open(struct wlan_objmgr_pdev *pdev)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-/**
- * ucfg_mlme_pdev_close() - MLME component pdev close
- * @pdev: pointer to pdev object
- *
- * close the MLME pdev information
- *
- * Return: QDF Status
- */
-static inline QDF_STATUS ucfg_mlme_pdev_close(struct wlan_objmgr_pdev *pdev)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-/**
- * ucfg_mlme_global_init() - initialize global mlme ops and structure
- *
- * Return: QDF Status
- */
-static inline QDF_STATUS ucfg_mlme_global_init(void)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-/**
- * ucfg_mlme_global_deinit() - deinitialize global mlme ops and structure
- *
- * Return: QDF Status
- */
-static inline QDF_STATUS ucfg_mlme_global_deinit(void)
-{
-	return QDF_STATUS_SUCCESS;
-}
-#endif
 
 /**
  * wlan_mlme_get_power_usage() - Get the power usage info

mlme/dispatcher/src/wlan_mlme_ucfg_api.c

@@ -26,21 +26,8 @@
 #include "wlan_mlme_ucfg_api.h"
 #include "wlan_objmgr_pdev_obj.h"
 #include "wlan_mlme_vdev_mgr_interface.h"
-#ifdef CONFIG_VDEV_SM
 #include <include/wlan_pdev_mlme.h>
 #include "wlan_pdev_mlme_api.h"
-#endif
-
-#ifdef CONFIG_VDEV_SM
-static QDF_STATUS ucfg_mlme_vdev_init(void)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-static QDF_STATUS ucfg_mlme_vdev_deinit(void)
-{
-	return QDF_STATUS_SUCCESS;
-}
 
 QDF_STATUS ucfg_mlme_global_init(void)
 {
@@ -54,56 +41,6 @@ QDF_STATUS ucfg_mlme_global_deinit(void)
 	return QDF_STATUS_SUCCESS;
 }
 
-#else
-static QDF_STATUS ucfg_mlme_vdev_init(void)
-{
-	QDF_STATUS status;
-
-	status = wlan_objmgr_register_vdev_create_handler(
-			WLAN_UMAC_COMP_MLME,
-			mlme_vdev_object_created_notification,
-			NULL);
-	if (QDF_IS_STATUS_ERROR(status)) {
-		mlme_legacy_err("unable to register vdev create handle");
-		return status;
-	}
-
-	status = wlan_objmgr_register_vdev_destroy_handler(
-			WLAN_UMAC_COMP_MLME,
-			mlme_vdev_object_destroyed_notification,
-			NULL);
-	if (QDF_IS_STATUS_ERROR(status))
-		mlme_legacy_err("unable to register vdev create handle");
-
-	return status;
-
-}
-
-static QDF_STATUS ucfg_mlme_vdev_deinit(void)
-{
-	QDF_STATUS status;
-
-	status = wlan_objmgr_unregister_vdev_destroy_handler(
-			WLAN_UMAC_COMP_MLME,
-			mlme_vdev_object_destroyed_notification,
-			NULL);
-
-	if (QDF_IS_STATUS_ERROR(status))
-		mlme_legacy_err("unable to unregister vdev destroy handle");
-
-	status = wlan_objmgr_unregister_vdev_create_handler(
-			WLAN_UMAC_COMP_MLME,
-			mlme_vdev_object_created_notification,
-			NULL);
-
-	if (QDF_IS_STATUS_ERROR(status))
-		mlme_legacy_err("unable to unregister vdev create handle");
-
-	return status;
-}
-
-#endif
-
 QDF_STATUS ucfg_mlme_init(void)
 {
 	QDF_STATUS status;
@@ -126,10 +63,6 @@ QDF_STATUS ucfg_mlme_init(void)
 		return status;
 	}
 
-	status = ucfg_mlme_vdev_init();
-	if (QDF_IS_STATUS_ERROR(status))
-		return status;
-
 	status = wlan_objmgr_register_peer_create_handler(
 			WLAN_UMAC_COMP_MLME,
 			mlme_peer_object_created_notification,
@@ -169,10 +102,6 @@ QDF_STATUS ucfg_mlme_deinit(void)
 	if (QDF_IS_STATUS_ERROR(status))
 		mlme_legacy_err("unable to unregister peer create handle");
 
-	status = ucfg_mlme_vdev_deinit();
-	if (QDF_IS_STATUS_ERROR(status))
-		mlme_legacy_err("unable to unregister vdev destroy handle");
-
 	status = wlan_objmgr_unregister_psoc_destroy_handler(
 			WLAN_UMAC_COMP_MLME,
 			mlme_psoc_object_destroyed_notification,
@@ -207,7 +136,6 @@ void ucfg_mlme_psoc_close(struct wlan_objmgr_psoc *psoc)
 	/* Clear the MLME CFG Structure */
 }
 
-#ifdef CONFIG_VDEV_SM
 QDF_STATUS ucfg_mlme_pdev_open(struct wlan_objmgr_pdev *pdev)
 {
 	struct pdev_mlme_obj *pdev_mlme;
@@ -226,7 +154,6 @@ QDF_STATUS ucfg_mlme_pdev_close(struct wlan_objmgr_pdev *pdev)
 {
 	return QDF_STATUS_SUCCESS;
 }
-#endif
 
 QDF_STATUS
 ucfg_mlme_get_sta_keep_alive_period(struct wlan_objmgr_psoc *psoc,