From adbe0c50ebed20538c23d52f30009a2a24a7b40b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Wed, 7 Nov 2018 15:03:19 -0800
Subject: [PATCH] qcacld-3.0: Replace tHalHandle in sme_qos

I9d0d7d109621237f29d66f7b06c5b63c38f63fb2 (qcacld-3.0: Introduce
mac_handle_t) introduced a "better" name for tHalHandle, so replace
tHalHandle with mac_handle_t in sme_qos.

Change-Id: I47f4e41e7d8cceafd2232392f00fc0dad64fa842
CRs-Fixed: 2348550
---
 core/sme/inc/sme_qos_api.h | 13 +++++++------
 core/sme/src/qos/sme_qos.c | 23 ++++++++++++-----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h
index de71f94feb7c..fe623d3d0c47 100644
--- a/core/sme/inc/sme_qos_api.h
+++ b/core/sme/inc/sme_qos_api.h
@@ -195,22 +195,23 @@ struct sme_qos_wmmtspecinfo {
 };
 
 /* External APIs */
-typedef QDF_STATUS (*sme_QosCallback)(tHalHandle hHal, void *HDDcontext,
+typedef QDF_STATUS (*sme_QosCallback)(mac_handle_t hHal, void *HDDcontext,
 		struct sme_qos_wmmtspecinfo *pCurrentQoSInfo,
 		enum sme_qos_statustype status, uint32_t QosFlowID);
-enum sme_qos_statustype sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId,
+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(tHalHandle hHal,
+enum sme_qos_statustype sme_qos_modify_req(mac_handle_t hHal,
 		struct sme_qos_wmmtspecinfo *pQoSInfo, uint32_t QosFlowID);
-enum sme_qos_statustype sme_qos_release_req(tHalHandle hHal, uint8_t session_id,
-				      uint32_t QosFlowID);
+enum sme_qos_statustype sme_qos_release_req(mac_handle_t hHal,
+					    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(tHalHandle hHal,
+QDF_STATUS sme_update_dsc_pto_up_mapping(mac_handle_t hHal,
 		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 a7efae298400..2e1437fb16fa 100644
--- a/core/sme/src/qos/sme_qos.c
+++ b/core/sme/src/qos/sme_qos.c
@@ -671,12 +671,12 @@ 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(tHalHandle 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_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)
 {
 	struct sme_qos_sessioninfo *pSession;
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
@@ -749,9 +749,9 @@ enum sme_qos_statustype sme_qos_setup_req(tHalHandle 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(tHalHandle hHal,
-				     struct sme_qos_wmmtspecinfo *pQoSInfo,
-				     uint32_t QosFlowID)
+enum sme_qos_statustype sme_qos_modify_req(mac_handle_t hHal,
+					struct sme_qos_wmmtspecinfo *pQoSInfo,
+					uint32_t QosFlowID)
 {
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -792,8 +792,9 @@ enum sme_qos_statustype sme_qos_modify_req(tHalHandle hHal,
  *
  * Return: QDF_STATUS_SUCCESS - Release is successful.
  */
-enum sme_qos_statustype sme_qos_release_req(tHalHandle hHal, uint8_t session_id,
-				      uint32_t QosFlowID)
+enum sme_qos_statustype sme_qos_release_req(mac_handle_t hHal,
+					    uint8_t session_id,
+					    uint32_t QosFlowID)
 {
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);