Преглед изворни кода

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
Srinivas Girigowda пре 8 година
родитељ
комит
8187e79b11
3 измењених фајлова са 12 додато и 12 уклоњено
  1. 6 6
      core/hdd/inc/wlan_hdd_cfg.h
  2. 5 5
      core/hdd/src/wlan_hdd_cfg.c
  3. 1 1
      core/hdd/src/wlan_hdd_main.c

+ 6 - 6
core/hdd/inc/wlan_hdd_cfg.h

@@ -6921,11 +6921,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"
@@ -9957,7 +9957,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 */
 

+ 5 - 5
core/hdd/src/wlan_hdd_cfg.c

@@ -3214,13 +3214,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,

+ 1 - 1
core/hdd/src/wlan_hdd_main.c

@@ -5000,7 +5000,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);