Browse Source

qcacmn: Cleanup CONFIG_MCL for pktlog related code

Replace macro CONFIG_MCL with FEATURE_PKTLOG for
pktlog related code.

Add some macro changes to ensure the following 3
functions' declarations are enclosed by the right
macros:

wlan_deregister_txrx_packetdump
wlan_register_txrx_packetdump
wlan_pkt_stats_to_logger_thread

Change-Id: I900de3be28faee8403923a5e4bd326e69895d998
CRs-Fixed: 2406250
wadesong 5 years ago
parent
commit
9b220a6ec6

+ 5 - 3
utils/logging/inc/wlan_logging_sock_svc.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -60,7 +60,8 @@ static inline void wlan_logging_set_active(bool active) {}
 static inline void wlan_logging_set_log_to_console(bool log_to_console) {}
 #endif /* WLAN_LOGGING_SOCK_SVC_ENABLE */
 
-#if defined(WLAN_LOGGING_SOCK_SVC_ENABLE) && !defined(REMOVE_PKT_LOG)
+#if defined(WLAN_LOGGING_SOCK_SVC_ENABLE) && \
+	defined(FEATURE_PKTLOG) && !defined(REMOVE_PKT_LOG)
 void wlan_deregister_txrx_packetdump(void);
 void wlan_register_txrx_packetdump(void);
 #else
@@ -84,7 +85,8 @@ static inline void wlan_report_log_completion(uint32_t is_fatal,
 
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
-#if defined(CONFIG_MCL) && !defined(REMOVE_PKT_LOG)
+#if defined(WLAN_LOGGING_SOCK_SVC_ENABLE) && \
+	defined(FEATURE_PKTLOG) && !defined(REMOVE_PKT_LOG)
 void wlan_pkt_stats_to_logger_thread(void *pl_hdr, void *pkt_dump, void *data);
 #else
 static inline

+ 2 - 2
utils/logging/src/wlan_logging_sock_svc.c

@@ -1146,7 +1146,7 @@ void wlan_flush_host_logs_for_fatal(void)
 #endif
 }
 
-#ifdef CONFIG_MCL
+#ifdef FEATURE_PKTLOG
 #ifndef REMOVE_PKT_LOG
 
 static uint8_t gtx_count;
@@ -1532,5 +1532,5 @@ void wlan_register_txrx_packetdump(void)
 	grx_count = 0;
 }
 #endif /* REMOVE_PKT_LOG */
-#endif /* CONFIG_MCL */
+#endif /* FEATURE_PKTLOG */
 #endif /* WLAN_LOGGING_SOCK_SVC_ENABLE */