From ba77885b372a10f57f5a5784544e00036e31bb19 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 6 Jan 2017 13:23:04 -0800 Subject: [PATCH] qcacld-3.0: Rename HDD VDEV object delete API Rename HDD VDEV object delete API to hdd_release_and_destroy_vdev to indicate its true behaviour. Change-Id: Id8baa4523b3684bea2cb9657225f82a50b1980f5 CRs-Fixed: 1108535 --- core/hdd/inc/wlan_hdd_main.h | 4 ++-- core/hdd/src/wlan_hdd_hostapd.c | 4 ++-- core/hdd/src/wlan_hdd_main.c | 8 ++++---- core/hdd/src/wlan_hdd_nan_datapath.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 81a089d86cbd..32be73d3a5b0 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -2069,14 +2069,14 @@ QDF_STATUS hdd_create_and_store_vdev(struct wlan_objmgr_pdev *pdev, hdd_adapter_t *adapter); /** - * hdd_destroy_and_release_vdev() - Delete the vdev object + * hdd_release_and_destroy_vdev() - Delete the vdev object * @hdd_ctx: Hdd context * * This API deletes vdev object and release its reference from hdd adapter * * Return: QDF_STATUS */ -QDF_STATUS hdd_destroy_and_release_vdev(hdd_adapter_t *adapter); +QDF_STATUS hdd_release_and_destroy_vdev(hdd_adapter_t *adapter); /** * hdd_add_peer_object() - Create and add the peer object to the vdev diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index d93debdbaa33..ca55c36342eb 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -5895,7 +5895,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) error_wmm_init: hdd_softap_deinit_tx_rx(pAdapter); error_init_ap_mode: - status = hdd_destroy_and_release_vdev(pAdapter); + status = hdd_release_and_destroy_vdev(pAdapter); if (QDF_IS_STATUS_ERROR(status)) hdd_err("vdev delete failed"); error_vdev_create: @@ -6072,7 +6072,7 @@ QDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held) hdd_err("Failed:WLANSAP_close"); pAdapter->sessionCtx.ap.sapContext = NULL; - status = hdd_destroy_and_release_vdev(pAdapter); + status = hdd_release_and_destroy_vdev(pAdapter); if (QDF_IS_STATUS_ERROR(status)) hdd_err("vdev delete failed"); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index fa7b99021daf..4167b832959a 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2759,7 +2759,7 @@ error_wmm_init: error_init_txrx: hdd_unregister_wext(pWlanDev); error_register_wext: - status = hdd_destroy_and_release_vdev(adapter); + status = hdd_release_and_destroy_vdev(adapter); if (QDF_IS_STATUS_ERROR(status)) hdd_err("vdev delete failed"); error_vdev_create: @@ -2924,7 +2924,7 @@ static void hdd_cleanup_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, return; } - qdf_status = hdd_destroy_and_release_vdev(adapter); + qdf_status = hdd_release_and_destroy_vdev(adapter); if (QDF_IS_STATUS_ERROR(qdf_status)) hdd_err("vdev delete failed"); @@ -3559,7 +3559,7 @@ static void hdd_wait_for_sme_close_sesion(hdd_context_t *hdd_ctx, clear_bit(SME_SESSION_OPENED, &adapter->event_flags); return; } - qdf_status = hdd_destroy_and_release_vdev(adapter); + qdf_status = hdd_release_and_destroy_vdev(adapter); if (QDF_IS_STATUS_ERROR(qdf_status)) hdd_err("vdev delete failed"); @@ -10015,7 +10015,7 @@ QDF_STATUS hdd_create_and_store_vdev(struct wlan_objmgr_pdev *pdev, return QDF_STATUS_SUCCESS; } -QDF_STATUS hdd_destroy_and_release_vdev(hdd_adapter_t *adapter) +QDF_STATUS hdd_release_and_destroy_vdev(hdd_adapter_t *adapter) { struct wlan_objmgr_vdev *vdev = adapter->hdd_vdev; diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c index 0a4b5503be50..c12dbffde440 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.c +++ b/core/hdd/src/wlan_hdd_nan_datapath.c @@ -141,7 +141,7 @@ static int hdd_close_ndi(hdd_adapter_t *adapter) if (!rc) hdd_err("session close timeout"); - qdf_status = hdd_destroy_and_release_vdev(adapter); + qdf_status = hdd_release_and_destroy_vdev(adapter); if (QDF_IS_STATUS_ERROR(qdf_status)) hdd_err("vdev delete failed"); } @@ -1942,7 +1942,7 @@ error_init_txrx: hdd_unregister_wext(wlan_dev); error_register_wext: - status = hdd_destroy_and_release_vdev(adapter); + status = hdd_release_and_destroy_vdev(adapter); if (QDF_IS_STATUS_ERROR(status)) hdd_err("vdev delete failed"); error_vdev_create: