From 630fd6a3c327d2d64bb57ec7d9d0e3b37f1fe8c5 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 25 Sep 2017 15:27:39 -0700 Subject: [PATCH] qcacld-3.0: Refine API wlansap_acs_chselect() See change "qcacld-3.0: Refine API wlansap_open()" for the API history. Update wlansap_acs_chselect() to use the true struct pointer type. Change-Id: I954c519954207c5cc487296dd42b8b2b46c08173 CRs-Fixed: 2116267 --- core/sap/inc/sap_api.h | 24 ++++++++++++++++++++---- core/sap/src/sap_module.c | 30 ++++++------------------------ 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index 66382039547b..d603391b83b0 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -1328,10 +1328,26 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, uint16_t reason_code, uint8_t subtype, struct tagCsrDelStaParams *pDelStaParams); -QDF_STATUS wlansap_acs_chselect(void *pvos_gctx, - tpWLAN_SAPEventCB pacs_event_callback, - tsap_Config_t *pconfig, - void *pusr_context); + +/** + * wlansap_acs_chselect() - Initiates acs channel selection + * @sap_context: Pointer to SAP context structure + * @pacs_event_callback: Callback function in hdd called by sap + * to inform hdd about channel selection result + * @pconfig: Pointer to configuration structure + * passed down from hdd + * @pusr_context: Parameter that will be passed back in all + * the sap callback events. + * + * This function serves as an api for hdd to initiate acs scan pre + * start bss. + * + * Return: The QDF_STATUS code associated with performing the operation. + */ +QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context, + tpWLAN_SAPEventCB pacs_event_callback, + tsap_Config_t *pconfig, + void *pusr_context); uint32_t wlansap_get_chan_width(void *cds_ctx); diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 96ff43d89a10..b0e6f5af493c 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -2704,37 +2704,19 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, MAC_ADDR_ARRAY(pDelStaParams->peerMacAddr.bytes)); } -/** - * wlansap_acs_chselect() - Initiates acs channel selection - * @pvos_gctx: Pointer to vos global context structure - * @pacs_event_callback: Callback function in hdd called by sap - * to inform hdd about channel section result - * @pconfig: Pointer to configuration structure - * passed down from hdd - * @pusr_context: Parameter that will be passed back in all - * the sap callback events. - * - * This function serves as an api for hdd to initiate acs scan pre - * start bss. - * - * Return: The QDF_STATUS code associated with performing the operation. - */ -QDF_STATUS -wlansap_acs_chselect(void *pvos_gctx, - tpWLAN_SAPEventCB pacs_event_callback, - tsap_Config_t *pconfig, - void *pusr_context) +QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context, + tpWLAN_SAPEventCB pacs_event_callback, + tsap_Config_t *pconfig, + void *pusr_context) { - struct sap_context *sap_context = NULL; tHalHandle h_hal = NULL; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pmac = NULL; tWLAN_SAPEvent sapEvent; /* State machine event */ - sap_context = CDS_GET_SAP_CB(pvos_gctx); if (NULL == sap_context) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: Invalid SAP pointer from pvos_gctx", __func__); + "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2742,7 +2724,7 @@ wlansap_acs_chselect(void *pvos_gctx, h_hal = (tHalHandle)CDS_GET_HAL_CB(); if (NULL == h_hal) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: Invalid MAC context from pvosGCtx", __func__); + "%s: Invalid MAC context", __func__); return QDF_STATUS_E_FAULT; }