qcacld-3.0: Replace wlanLoggingFEToConsole to wlanLoggingToConsole

Currently the config ini "wlanLoggingFEToConsole" specifically talks
about enabling the logs to kmsg for FATAL and ERROR logs.

This cfg.ini item should not be specific to any log level, instead
it should just depict whether logging to console should be enabled
or not.  Hence change wlanLoggingFEToConsole to wlanLoggingToConsole.

Change-Id: I54e340ed58891175b53ac2d0137d15a2baea1c9f
CRs-Fixed: 2014745

4 files changed, 16 insertions, 16 deletions

diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 4d05d0b646de..43d72bb8347a 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -7393,11 +7393,11 @@ typedef enum {
 #define CFG_WLAN_LOGGING_SUPPORT_DISABLE            (0)
 #define CFG_WLAN_LOGGING_SUPPORT_DEFAULT            (1)
 
-/* Enable FATAL and ERROR logs for kmsg console */
-#define CFG_WLAN_LOGGING_FE_CONSOLE_SUPPORT_NAME    "wlanLoggingFEToConsole"
-#define CFG_WLAN_LOGGING_FE_CONSOLE_SUPPORT_ENABLE  (1)
-#define CFG_WLAN_LOGGING_FE_CONSOLE_SUPPORT_DISABLE (0)
-#define CFG_WLAN_LOGGING_FE_CONSOLE_SUPPORT_DEFAULT (1)
+/* Enable forwarding the driver logs to kmsg console */
+#define CFG_WLAN_LOGGING_CONSOLE_SUPPORT_NAME    "wlanLoggingToConsole"
+#define CFG_WLAN_LOGGING_CONSOLE_SUPPORT_ENABLE  (1)
+#define CFG_WLAN_LOGGING_CONSOLE_SUPPORT_DISABLE (0)
+#define CFG_WLAN_LOGGING_CONSOLE_SUPPORT_DEFAULT (1)
 
 /* Number of buffers to be used for WLAN logging */
 #define CFG_WLAN_LOGGING_NUM_BUF_NAME               "wlanLoggingNumBuf"
@@ -10465,7 +10465,7 @@ struct hdd_config {
 #ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
 	/* WLAN Logging */
 	uint32_t wlanLoggingEnable;
-	uint32_t wlanLoggingFEToConsole;
+	uint32_t wlanLoggingToConsole;
 	uint32_t wlanLoggingNumBuf;
 #endif /* WLAN_LOGGING_SOCK_SVC_ENABLE */
 
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index 0c3fabbab550..67584abc878a 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -3259,13 +3259,13 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_WLAN_LOGGING_SUPPORT_DISABLE,
 		     CFG_WLAN_LOGGING_SUPPORT_ENABLE),
 
-	REG_VARIABLE(CFG_WLAN_LOGGING_FE_CONSOLE_SUPPORT_NAME,
+	REG_VARIABLE(CFG_WLAN_LOGGING_CONSOLE_SUPPORT_NAME,
 		     WLAN_PARAM_Integer,
-		     struct hdd_config, wlanLoggingFEToConsole,
+		     struct hdd_config, wlanLoggingToConsole,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_WLAN_LOGGING_FE_CONSOLE_SUPPORT_DEFAULT,
-		     CFG_WLAN_LOGGING_FE_CONSOLE_SUPPORT_DISABLE,
-		     CFG_WLAN_LOGGING_FE_CONSOLE_SUPPORT_ENABLE),
+		     CFG_WLAN_LOGGING_CONSOLE_SUPPORT_DEFAULT,
+		     CFG_WLAN_LOGGING_CONSOLE_SUPPORT_DISABLE,
+		     CFG_WLAN_LOGGING_CONSOLE_SUPPORT_ENABLE),
 
 	REG_VARIABLE(CFG_WLAN_LOGGING_NUM_BUF_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, wlanLoggingNumBuf,
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 664434d6f22f..df66b14ccc34 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -4719,7 +4719,7 @@ static int hdd_logging_sock_activate_svc(hdd_context_t *hdd_ctx)
 	if (!config->wlanLoggingEnable)
 		return 0;
 
-	ret = wlan_logging_sock_activate_svc(config->wlanLoggingFEToConsole,
+	ret = wlan_logging_sock_activate_svc(config->wlanLoggingToConsole,
 					     config->wlanLoggingNumBuf);
 	if (ret)
 		hdd_err("wlan_logging_sock_activate_svc failed: %d", ret);
diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c
index dd43d7621e2e..cdc6e9860ac4 100644
--- a/core/utils/logging/src/wlan_logging_sock_svc.c
+++ b/core/utils/logging/src/wlan_logging_sock_svc.c
@@ -134,7 +134,7 @@ struct pkt_stats_msg {
 
 struct wlan_logging {
 	/* Log Fatal and ERROR to console */
-	bool log_fe_to_console;
+	bool log_to_console;
 	/* Number of buffers to be used for logging */
 	int num_buf;
 	/* Lock to synchronize access to shared logging resource */
@@ -490,7 +490,7 @@ int wlan_log_to_user(QDF_TRACE_LEVEL log_level, char *to_be_sent, int length)
 			wake_up_interruptible(&gwlan_logging.wait_queue);
 	}
 
-	if (gwlan_logging.log_fe_to_console
+	if (gwlan_logging.log_to_console
 	    && ((QDF_TRACE_LEVEL_FATAL == log_level)
 		|| (QDF_TRACE_LEVEL_ERROR == log_level))) {
 		pr_info("%s %s\n", tbuf, to_be_sent);
@@ -1019,7 +1019,7 @@ static void unregister_logging_sock_handler(void)
 #endif
 
 
-int wlan_logging_sock_activate_svc(int log_fe_to_console, int num_buf)
+int wlan_logging_sock_activate_svc(int log_to_console, int num_buf)
 {
 	int i = 0, j, pkt_stats_size;
 	unsigned long irq_flag;
@@ -1034,7 +1034,7 @@ int wlan_logging_sock_activate_svc(int log_fe_to_console, int num_buf)
 
 	qdf_mem_zero(gplog_msg, (num_buf * sizeof(struct log_msg)));
 
-	gwlan_logging.log_fe_to_console = !!log_fe_to_console;
+	gwlan_logging.log_to_console = !!log_to_console;
 	gwlan_logging.num_buf = num_buf;
 
 	spin_lock_irqsave(&gwlan_logging.spin_lock, irq_flag);