瀏覽代碼

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
Jeff Johnson 6 年之前
父節點
當前提交
74df585cec
共有 2 個文件被更改,包括 14 次插入13 次删除
  1. 9 0
      core/sme/inc/csr_api.h
  2. 5 13
      core/sme/src/csr/csr_api_roam.c

+ 9 - 0
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);
 
 /**

+ 5 - 13
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");