From e7ff1d07db3ca908d4403fe3e438b802447b7183 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 25 Sep 2017 14:03:34 -0700 Subject: [PATCH] qcacld-3.0: Refine API wlansap_deauth_sta() See change "qcacld-3.0: Refine API wlansap_open()" for the API history. Update wlansap_deauth_sta() to use the true struct pointer type. Change-Id: Ia58822ad42d2a36333c4c085f6a4f4498d70e5f8 CRs-Fixed: 2116267 --- core/sap/inc/sap_api.h | 15 +++++++++++++-- core/sap/src/sap_module.c | 22 ++-------------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index 84baf3db3c9e..7e0e89ece44f 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -992,8 +992,19 @@ QDF_STATUS wlansap_set_mac_acl(struct sap_context *pSapCtx, QDF_STATUS wlansap_disassoc_sta(struct sap_context *pSapCtx, struct tagCsrDelStaParams *p_del_sta_params); -QDF_STATUS wlansap_deauth_sta(void *p_cds_gctx, - struct tagCsrDelStaParams *pDelStaParams); +/** + * wlansap_deauth_sta() - Ap App/HDD initiated deauthentication of station + * @pStaCtx : Pointer to the SAP context + * @pDelStaParams : Pointer to parameters of the station to deauthenticate + * + * This api function provides for Ap App/HDD initiated deauthentication of + * station + * + * Return: The QDF_STATUS code associated with performing the operation + */ +QDF_STATUS wlansap_deauth_sta(struct sap_context *pSapCtx, + struct tagCsrDelStaParams *pDelStaParams); + QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, enum phy_ch_width target_bw, bool strict); QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 42d81f29b626..8389b82793c8 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1154,33 +1154,15 @@ QDF_STATUS wlansap_disassoc_sta(struct sap_context *pSapCtx, return QDF_STATUS_SUCCESS; } -/** - * wlansap_deauth_sta() - Ap App/HDD initiated deauthentication of station - * @pCtx : Pointer to the global cds context; a handle to SAP's - * control block can be extracted from its context - * When MBSSID feature is enabled, SAP context is directly - * passed to SAP APIs - * @pDelStaParams : Pointer to parameters of the station to deauthenticate - * - * This api function provides for Ap App/HDD initiated deauthentication of - * station - * - * Return: The QDF_STATUS code associated with performing the operation - */ -QDF_STATUS wlansap_deauth_sta(void *pCtx, +QDF_STATUS wlansap_deauth_sta(struct sap_context *pSapCtx, struct tagCsrDelStaParams *pDelStaParams) { QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; - struct sap_context *pSapCtx = CDS_GET_SAP_CB(pCtx); - /*------------------------------------------------------------------------ - Sanity check - Extract SAP control block - ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: Invalid SAP pointer from pCtx", __func__); + "%s: Invalid SAP pointer", __func__); return qdf_status; }