From a8a1f93112adbaf4cf9407ed095bebfb3df98d9c Mon Sep 17 00:00:00 2001 From: Akshay Kosigi Date: Fri, 17 May 2019 12:49:40 +0530 Subject: [PATCH] qcacmn: Add change to deinit vdev timer Move deinit of vdev timer under CMN_VDEV_MGR_TGT_IF_ENABLE macro Change-Id: I1815c93f8690757d8bd3b199eb009620227ee6b1 --- .../dispatcher/src/wlan_vdev_mlme_main.c | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c b/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c index 348b0a42be48..ddd41b274409 100644 --- a/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c +++ b/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c @@ -103,6 +103,21 @@ init_failed: return QDF_STATUS_E_FAILURE; } +#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE +static void mlme_vdev_obj_timer_deinit( + struct vdev_mlme_obj *vdev_mlme) +{ + struct vdev_response_timer *vdev_rsp; + + vdev_rsp = &vdev_mlme->vdev_rt; + qdf_timer_free(&vdev_rsp->rsp_timer); +} +#else +static void mlme_vdev_obj_timer_deinit( + struct vdev_mlme_obj *vdev_mlme) +{ +} +#endif static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev, void *arg) { @@ -110,7 +125,6 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev, struct wlan_objmgr_psoc *psoc; struct cdp_soc_t *soc_txrx_handle; struct cdp_vdev *vdev_txrx_handle; - struct vdev_response_timer *vdev_rsp; if (!vdev) { mlme_err(" VDEV is NULL"); @@ -132,8 +146,8 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev, NULL, NULL); } - vdev_rsp = &vdev_mlme->vdev_rt; - qdf_timer_free(&vdev_rsp->rsp_timer); + mlme_vdev_obj_timer_deinit(vdev_mlme); + mlme_vdev_sm_destroy(vdev_mlme); mlme_vdev_ops_ext_hdl_destroy(vdev_mlme);