From 4cbb2ada5b4d17569cec6650c4bb02491ada668a Mon Sep 17 00:00:00 2001 From: Jingxiang Ge Date: Fri, 5 Jul 2019 17:10:52 +0800 Subject: [PATCH] qcacmn: Remove CONFIG_MCL in wlan_flush_host_logs_for_fatal This is to remove CONFIG_MCL in wlan_flush_host_logs_for_fatal. And move condition cds_is_log_report_in_progress to qcacld code. Change-Id: Ie231e966229789bcd8fa69aef1bc20e9b07a88ae CRs-Fixed: 2484897 --- utils/logging/src/wlan_logging_sock_svc.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/utils/logging/src/wlan_logging_sock_svc.c b/utils/logging/src/wlan_logging_sock_svc.c index 1ebf937661d8..b65033970c4b 100644 --- a/utils/logging/src/wlan_logging_sock_svc.c +++ b/utils/logging/src/wlan_logging_sock_svc.c @@ -1126,20 +1126,14 @@ void wlan_flush_host_logs_for_fatal(void) { unsigned long flags; -#ifdef CONFIG_MCL - if (cds_is_log_report_in_progress()) { -#endif - if (gwlan_logging.flush_timer_period == 0) - pr_info("%s:flush all host logs Setting HOST_LOG_POST_MASK\n", - __func__); - spin_lock_irqsave(&gwlan_logging.spin_lock, flags); - wlan_queue_logmsg_for_app(); - spin_unlock_irqrestore(&gwlan_logging.spin_lock, flags); - set_bit(HOST_LOG_DRIVER_MSG, &gwlan_logging.eventFlag); - wake_up_interruptible(&gwlan_logging.wait_queue); -#ifdef CONFIG_MCL - } -#endif + if (gwlan_logging.flush_timer_period == 0) + pr_info("%s:flush all host logs Setting HOST_LOG_POST_MASK\n", + __func__); + spin_lock_irqsave(&gwlan_logging.spin_lock, flags); + wlan_queue_logmsg_for_app(); + spin_unlock_irqrestore(&gwlan_logging.spin_lock, flags); + set_bit(HOST_LOG_DRIVER_MSG, &gwlan_logging.eventFlag); + wake_up_interruptible(&gwlan_logging.wait_queue); } #ifdef FEATURE_PKTLOG