From 74df585cec8d735b3b913f57183b3945f37a337e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Tue, 30 Oct 2018 12:07:12 -0700
Subject: [PATCH] qcacld-3.0: Use mac_handle_t in csr_packetdump_timer_stop()

Change "qcacld-3.0: Introduce mac_handle_t" introduced a modern
name for what was previously called the tHalHandle. Transition
csr_packetdump_timer_stop() to use the new naming.

Change-Id: I420949b9d4a88c9aaec7ee768914583f17fefadb
CRs-Fixed: 2347656
---
 core/sme/inc/csr_api.h          |  9 +++++++++
 core/sme/src/csr/csr_api_roam.c | 18 +++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index 46801995be37..df7b71aaef91 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -1651,6 +1651,15 @@ static inline void csr_roam_fill_tdls_info(tpAniSirGlobal mac_ctx,
 					   tpSirSmeJoinRsp join_rsp)
 {}
 #endif
+
+/**
+ * csr_packetdump_timer_stop() - stops packet dump timer
+ *
+ * This function is used to stop packet dump timer
+ *
+ * Return: None
+ *
+ */
 void csr_packetdump_timer_stop(void);
 
 /**
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index d3495b6e5153..a029c8642e7f 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -1360,27 +1360,19 @@ static void csr_packetdump_timer_handler(void *pv)
 	wlan_deregister_txrx_packetdump();
 }
 
-/**
- * csr_packetdump_timer_stop() - stops packet dump timer
- *
- * This function is used to stop packet dump timer
- *
- * Return: None
- *
- */
 void csr_packetdump_timer_stop(void)
 {
 	QDF_STATUS status;
-	tHalHandle hal;
-	tpAniSirGlobal mac;
+	mac_handle_t mac_handle;
+	struct mac_context *mac;
 
-	hal = cds_get_context(QDF_MODULE_ID_SME);
-	if (hal == NULL) {
+	mac_handle = cds_get_context(QDF_MODULE_ID_SME);
+	mac = MAC_CONTEXT(mac_handle);
+	if (!mac) {
 		QDF_ASSERT(0);
 		return;
 	}
 
-	mac = PMAC_STRUCT(hal);
 	status = qdf_mc_timer_stop(&mac->roam.packetdump_timer);
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		sme_err("cannot stop packetdump timer");