From 330c0bf8ef5587a8eb2cb729ddaafaeb3487ccd5 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 1 Jun 2018 15:13:12 -0700 Subject: [PATCH] qcacld-3.0: Fix sme_update_channel_list() API Currently sme_update_channel_list() is defined to take a tpAniSirGlobal mac_ctx. However SME APIs are supposed to hide the fact that they operate on tpAniSirGlobal and instead should be taking a tHalHandle. Furthermore a tHalHandle is what is currently being passed by HDD. Therefore update sme_update_channel_list() to take a tHalHandle. Change-Id: I2f424a6c11342470fd6885968d635109327be3f0 CRs-Fixed: 2254947 --- core/sme/inc/sme_api.h | 10 +++++++++- core/sme/src/common/sme_api.c | 15 +++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 9b1a49721bbf..952c2590a5d0 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -502,7 +502,15 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, uint8_t *pCountry); -QDF_STATUS sme_update_channel_list(tpAniSirGlobal mac_ctx); +/** + * sme_update_channel_list() - Update configured channel list to fwr + * This is a synchronous API. + * @hal: HAL handle returned by mac_open. + * + * Return: QDF_STATUS SUCCESS. + * FAILURE or RESOURCES The API finished and failed. + */ +QDF_STATUS sme_update_channel_list(tHalHandle hal); QDF_STATUS sme_tx_fail_monitor_start_stop_ind(tHalHandle hHal, uint8_t tx_fail_count, diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index f617e79ea481..036ea4af7558 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -5750,19 +5750,10 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, return QDF_STATUS_SUCCESS; } -/** - * sme_update_channel_list() - Update configured channel list to fwr - * This is a synchronous API. - * - * @mac_ctx - The handle returned by mac_open. - * - * Return QDF_STATUS SUCCESS. - * FAILURE or RESOURCES The API finished and failed. - */ -QDF_STATUS -sme_update_channel_list(tpAniSirGlobal mac_ctx) +QDF_STATUS sme_update_channel_list(tHalHandle hal) { - QDF_STATUS status = QDF_STATUS_SUCCESS; + tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); + QDF_STATUS status; status = sme_acquire_global_lock(&mac_ctx->sme); if (QDF_IS_STATUS_SUCCESS(status)) {