From d5fb2dbc2635c2e48c9ad81236f248d0faa30779 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 8 Nov 2018 14:20:28 -0800 Subject: [PATCH] qcacld-3.0: Replace hal_ctx in sme_api Recently all instances of tHalHandle were replaced with mac_handle_t to align with current usage and the Linux coding standard. To align with the new naming now replace all instances of hal_ctx with mac_handle in sme_api. Change-Id: Ib17e1c7855c449533f0d7b13cd67dba224bb9a8e CRs-Fixed: 2351896 --- core/sme/inc/sme_api.h | 6 +++--- core/sme/src/common/sme_api.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 3100a4735e3d..9bc21b5fe686 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -1320,7 +1320,7 @@ QDF_STATUS sme_set_wisa_params(mac_handle_t hal, #ifdef WLAN_FEATURE_ROAM_OFFLOAD QDF_STATUS sme_update_roam_offload_enabled(mac_handle_t mac_handle, bool nRoamOffloadEnabled); -QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(mac_handle_t hal_ctx, +QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(mac_handle_t mac_handle, uint8_t session_id, bool key_mgmt_offload_enabled, struct pmkid_mode_bits *pmkid_modes); @@ -1893,12 +1893,12 @@ static inline bool sme_roam_is_ese_assoc(struct csr_roam_info *roam_info) #endif /** * sme_neighbor_roam_is11r_assoc() - Check if association type is 11R - * @hal_ctx: HAL handle + * @mac_handle: HAL handle * @session_id: session id * * Return: true if 11r Association, false otherwise. */ -bool sme_neighbor_roam_is11r_assoc(mac_handle_t hal_ctx, uint8_t session_id); +bool sme_neighbor_roam_is11r_assoc(mac_handle_t mac_handle, uint8_t session_id); /** * sme_update_sta_inactivity_timeout(): Update sta_inactivity_timeout to FW diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 504e013c4324..583da0f5e19d 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -12248,7 +12248,7 @@ QDF_STATUS sme_power_debug_stats_req(mac_handle_t hal, void (*callback_fn) /** * sme_update_roam_key_mgmt_offload_enabled() - enable/disable key mgmt offload * This is a synchronous call - * @hal_ctx: The handle returned by mac_open. + * @mac_handle: The handle returned by mac_open. * @session_id: Session Identifier * @key_mgmt_offload_enabled: key mgmt enable/disable flag * @pmkid_modes: PMKID modes of PMKSA caching and OKC @@ -12256,12 +12256,12 @@ QDF_STATUS sme_power_debug_stats_req(mac_handle_t hal, void (*callback_fn) * Other status means SME is failed to update. */ -QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(mac_handle_t hal_ctx, +QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(mac_handle_t mac_handle, uint8_t session_id, bool key_mgmt_offload_enabled, struct pmkid_mode_bits *pmkid_modes) { - tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); + tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle); QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&mac_ctx->sme); @@ -15316,9 +15316,9 @@ bool sme_roam_is_ese_assoc(struct csr_roam_info *roam_info) } #endif -bool sme_neighbor_roam_is11r_assoc(mac_handle_t hal_ctx, uint8_t session_id) +bool sme_neighbor_roam_is11r_assoc(mac_handle_t mac_handle, uint8_t session_id) { - tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); + tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle); return csr_neighbor_roam_is11r_assoc(mac_ctx, session_id); }