From d32f3622dc31a492ca8143003394166ebf4c484e Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 8 Nov 2018 10:15:50 -0800 Subject: [PATCH] qcacld-3.0: Replace hHal in sme_qos 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 hHal with mac_handle in sme_qos. Change-Id: I067ec7d921888cc8f743561810f9163bb4ea9008 CRs-Fixed: 2349569 --- core/sme/inc/sme_qos_api.h | 19 +++++++++++-------- core/sme/src/qos/sme_qos.c | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h index fe623d3d0c47..84e1db1dcc3c 100644 --- a/core/sme/inc/sme_qos_api.h +++ b/core/sme/inc/sme_qos_api.h @@ -195,23 +195,26 @@ struct sme_qos_wmmtspecinfo { }; /* External APIs */ -typedef QDF_STATUS (*sme_QosCallback)(mac_handle_t hHal, void *HDDcontext, +typedef QDF_STATUS (*sme_QosCallback)(mac_handle_t mac_handle, void *HDDcontext, struct sme_qos_wmmtspecinfo *pCurrentQoSInfo, enum sme_qos_statustype status, uint32_t QosFlowID); -enum sme_qos_statustype sme_qos_setup_req(mac_handle_t hHal, uint32_t sessionId, - struct sme_qos_wmmtspecinfo *pQoSInfo, - sme_QosCallback QoSCallback, void *HDDcontext, - enum sme_qos_wmmuptype UPType, uint32_t *pQosFlowID); -enum sme_qos_statustype sme_qos_modify_req(mac_handle_t hHal, +enum sme_qos_statustype sme_qos_setup_req(mac_handle_t mac_handle, + uint32_t sessionId, + struct sme_qos_wmmtspecinfo *pQoSInfo, + sme_QosCallback QoSCallback, + void *HDDcontext, + enum sme_qos_wmmuptype UPType, + uint32_t *pQosFlowID); +enum sme_qos_statustype sme_qos_modify_req(mac_handle_t mac_handle, struct sme_qos_wmmtspecinfo *pQoSInfo, uint32_t QosFlowID); -enum sme_qos_statustype sme_qos_release_req(mac_handle_t hHal, +enum sme_qos_statustype sme_qos_release_req(mac_handle_t mac_handle, uint8_t session_id, uint32_t QosFlowID); bool sme_qos_is_ts_info_ack_policy_valid(mac_handle_t mac_handle, struct sme_qos_wmmtspecinfo *pQoSInfo, uint8_t sessionId); void sme_qos_update_hand_off(uint8_t sessionId, bool updateHandOff); -QDF_STATUS sme_update_dsc_pto_up_mapping(mac_handle_t hHal, +QDF_STATUS sme_update_dsc_pto_up_mapping(mac_handle_t mac_handle, enum sme_qos_wmmuptype *dscpmapping, uint8_t sessionId); QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal mac_ctx, diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 2e1437fb16fa..61a95e8f4af1 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -646,7 +646,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) /** * sme_qos_setup_req() - The SME QoS API exposed to HDD to request for QoS * on a particular AC. - * @hHal: The handle returned by mac_open. + * @mac_handle: The handle returned by mac_open. * @sessionId: sessionId returned by sme_open_session. * @pQoSInfo: Pointer to struct sme_qos_wmmtspecinfo which contains the * WMM TSPEC related info as defined above, provided by HDD @@ -671,7 +671,8 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) * Return: QDF_STATUS_SUCCESS - Setup is successful. * Other status means Setup request failed */ -enum sme_qos_statustype sme_qos_setup_req(mac_handle_t hHal, uint32_t sessionId, +enum sme_qos_statustype sme_qos_setup_req(mac_handle_t mac_handle, + uint32_t sessionId, struct sme_qos_wmmtspecinfo *pQoSInfo, sme_QosCallback QoSCallback, void *HDDcontext, @@ -680,7 +681,7 @@ enum sme_qos_statustype sme_qos_setup_req(mac_handle_t hHal, uint32_t sessionId, { struct sme_qos_sessioninfo *pSession; QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + tpAniSirGlobal pMac = PMAC_STRUCT(mac_handle); enum sme_qos_statustype status; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, @@ -733,7 +734,7 @@ enum sme_qos_statustype sme_qos_setup_req(mac_handle_t hHal, uint32_t sessionId, /** * sme_qos_modify_req() - The SME QoS API exposed to HDD to request for * modification of certain QoS params on a flow running on a particular AC. - * @hHal: The handle returned by mac_open. + * @mac_handle: The handle returned by mac_open. * @pQoSInfo: Pointer to struct sme_qos_wmmtspecinfo which contains the * WMM TSPEC related info as defined above, provided by HDD * @QosFlowID: Identification per flow running on each AC generated by @@ -749,12 +750,12 @@ enum sme_qos_statustype sme_qos_setup_req(mac_handle_t hHal, uint32_t sessionId, * Return: SME_QOS_STATUS_SETUP_SUCCESS_RSP - Modification is successful. * Other status means request failed */ -enum sme_qos_statustype sme_qos_modify_req(mac_handle_t hHal, +enum sme_qos_statustype sme_qos_modify_req(mac_handle_t mac_handle, struct sme_qos_wmmtspecinfo *pQoSInfo, uint32_t QosFlowID) { QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + tpAniSirGlobal pMac = PMAC_STRUCT(mac_handle); enum sme_qos_statustype status; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, @@ -781,7 +782,7 @@ enum sme_qos_statustype sme_qos_modify_req(mac_handle_t hHal, * sme_qos_release_req() - The SME QoS API exposed to HDD to request for * releasing a QoS flow running on a particular AC. * - * @hHal: The handle returned by mac_open. + * @mac_handle: The handle returned by mac_open. * @session_id: session_id returned by sme_open_session. * @QosFlowID: Identification per flow running on each AC generated by SME * It is only meaningful if the QoS setup for the flow is successful @@ -792,12 +793,12 @@ enum sme_qos_statustype sme_qos_modify_req(mac_handle_t hHal, * * Return: QDF_STATUS_SUCCESS - Release is successful. */ -enum sme_qos_statustype sme_qos_release_req(mac_handle_t hHal, +enum sme_qos_statustype sme_qos_release_req(mac_handle_t mac_handle, uint8_t session_id, uint32_t QosFlowID) { QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + tpAniSirGlobal pMac = PMAC_STRUCT(mac_handle); enum sme_qos_statustype status; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,