samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Cleanup CONFIG_MCL for pktlog related code

Browse Source 
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
This commit is contained in:
wadesong
2019-06-28 14:34:18 +08:00
committed by nshrivas
parent 5936495779
commit 9b220a6ec6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/logging/inc/wlan_logging_sock_svc.h
View File

@@ -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

4
utils/logging/src/wlan_logging_sock_svc.c
View File

@@ -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 */