qcacmn: Replace void * data members of mlme with specific type

Replace mlme void * data members having different types across
different drivers with specific type.

Change-Id: I4343800e836c8ae0996c19b39a420b314e465a75
CRs-Fixed: 2477457
This commit is contained in:
Himanshu Batra
2019-05-31 11:50:10 +05:30
committed by nshrivas
parent e92fe029df
commit 1b60b56578
6 changed files with 15 additions and 8 deletions

View File

@@ -22,6 +22,7 @@
#include <qdf_timer.h> #include <qdf_timer.h>
#include <include/wlan_vdev_mlme.h> #include <include/wlan_vdev_mlme.h>
#include <wlan_ext_mlme_obj_types.h>
/* /*
* struct pdev_restart_attr - Pdev restart attributes * struct pdev_restart_attr - Pdev restart attributes
@@ -46,7 +47,7 @@ struct pdev_restart_attr {
*/ */
struct pdev_mlme_obj { struct pdev_mlme_obj {
struct wlan_objmgr_pdev *pdev; struct wlan_objmgr_pdev *pdev;
void *ext_pdev_ptr; mlme_pdev_ext_t *ext_pdev_ptr;
QDF_STATUS (*mlme_register_ops)(struct vdev_mlme_obj *vdev_mlme); QDF_STATUS (*mlme_register_ops)(struct vdev_mlme_obj *vdev_mlme);
qdf_spinlock_t vdev_restart_lock; qdf_spinlock_t vdev_restart_lock;
qdf_timer_t restart_req_timer; qdf_timer_t restart_req_timer;

View File

@@ -23,6 +23,7 @@
#include <wlan_vdev_mgr_tgt_if_rx_defs.h> #include <wlan_vdev_mgr_tgt_if_rx_defs.h>
#include <wlan_objmgr_vdev_obj.h> #include <wlan_objmgr_vdev_obj.h>
#include <wlan_vdev_mlme_api.h> #include <wlan_vdev_mlme_api.h>
#include <wlan_ext_mlme_obj_types.h>
struct vdev_mlme_obj; struct vdev_mlme_obj;
@@ -555,7 +556,7 @@ struct vdev_mlme_obj {
struct wlan_sm *sm_hdl; struct wlan_sm *sm_hdl;
struct wlan_objmgr_vdev *vdev; struct wlan_objmgr_vdev *vdev;
struct vdev_mlme_ops *ops; struct vdev_mlme_ops *ops;
void *ext_vdev_ptr; mlme_vdev_ext_t *ext_vdev_ptr;
struct vdev_response_timer vdev_rt; struct vdev_response_timer vdev_rt;
#ifdef FEATURE_VDEV_RSP_WAKELOCK #ifdef FEATURE_VDEV_RSP_WAKELOCK
struct vdev_mlme_wakelock vdev_wakelock; struct vdev_mlme_wakelock vdev_wakelock;

View File

@@ -23,6 +23,7 @@
/** /**
* wlan_pdev_mlme_get_cmpt_obj - Returns MLME component object * wlan_pdev_mlme_get_cmpt_obj - Returns MLME component object
* @pdev: PDEV object
* *
* Retrieves MLME component object from PDEV object * Retrieves MLME component object from PDEV object
* *
@@ -33,12 +34,13 @@ struct pdev_mlme_obj *wlan_pdev_mlme_get_cmpt_obj(
struct wlan_objmgr_pdev *pdev); struct wlan_objmgr_pdev *pdev);
/** /**
* wlan_pdev_mlme_get_ext_hdl - Returns legacy handle * wlan_pdev_mlme_get_ext_hdl - Returns legacy handle
* @pdev: PDEV object
* *
* Retrieves legacy handle from pdev mlme component object * Retrieves legacy handle from pdev mlme component object
* *
* Return: legacy handle on SUCCESS * Return: legacy handle on SUCCESS
* NULL, if it fails to retrieve * NULL, if it fails to retrieve
*/ */
void *wlan_pdev_mlme_get_ext_hdl(struct wlan_objmgr_pdev *pdev); mlme_pdev_ext_t *wlan_pdev_mlme_get_ext_hdl(struct wlan_objmgr_pdev *pdev);
#endif #endif

View File

@@ -43,7 +43,7 @@ struct pdev_mlme_obj *wlan_pdev_mlme_get_cmpt_obj(struct wlan_objmgr_pdev *pdev)
return pdev_mlme; return pdev_mlme;
} }
void *wlan_pdev_mlme_get_ext_hdl(struct wlan_objmgr_pdev *pdev) mlme_pdev_ext_t *wlan_pdev_mlme_get_ext_hdl(struct wlan_objmgr_pdev *pdev)
{ {
struct pdev_mlme_obj *pdev_mlme; struct pdev_mlme_obj *pdev_mlme;

View File

@@ -21,6 +21,7 @@
#ifndef _WLAN_VDEV_MLME_API_H_ #ifndef _WLAN_VDEV_MLME_API_H_
#define _WLAN_VDEV_MLME_API_H_ #define _WLAN_VDEV_MLME_API_H_
#include <wlan_ext_mlme_obj_types.h>
/** /**
* wlan_vdev_mlme_get_cmpt_obj - Retrieves MLME component object * wlan_vdev_mlme_get_cmpt_obj - Retrieves MLME component object
* from VDEV object * from VDEV object
@@ -42,7 +43,8 @@ struct vdev_mlme_obj *wlan_vdev_mlme_get_cmpt_obj(
* *
* Return: * Return:
*/ */
void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl); void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev,
mlme_vdev_ext_t *ext_hdl);
/** /**
* wlan_vdev_mlme_get_ext_hdl - Returns legacy handle * wlan_vdev_mlme_get_ext_hdl - Returns legacy handle
@@ -53,7 +55,7 @@ void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl);
* Return: legacy handle on SUCCESS * Return: legacy handle on SUCCESS
* NULL, if it fails to retrieve * NULL, if it fails to retrieve
*/ */
void *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev); mlme_vdev_ext_t *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev);
/** /**
* wlan_vdev_mlme_sm_deliver_evt() - Delivers event to VDEV MLME SM * wlan_vdev_mlme_sm_deliver_evt() - Delivers event to VDEV MLME SM

View File

@@ -46,7 +46,8 @@ struct vdev_mlme_obj *wlan_vdev_mlme_get_cmpt_obj(struct wlan_objmgr_vdev *vdev)
qdf_export_symbol(wlan_vdev_mlme_get_cmpt_obj); qdf_export_symbol(wlan_vdev_mlme_get_cmpt_obj);
void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl) void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev,
mlme_vdev_ext_t *ext_hdl)
{ {
struct vdev_mlme_obj *vdev_mlme; struct vdev_mlme_obj *vdev_mlme;
@@ -62,7 +63,7 @@ void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl)
qdf_export_symbol(wlan_vdev_mlme_set_ext_hdl); qdf_export_symbol(wlan_vdev_mlme_set_ext_hdl);
void *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev) mlme_vdev_ext_t *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev)
{ {
struct vdev_mlme_obj *vdev_mlme; struct vdev_mlme_obj *vdev_mlme;