summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Girigowda <sgirigow@codeaurora.org>2017-03-15 22:59:09 -0700
committerSandeep Puligilla <spuligil@codeaurora.org>2017-03-21 09:40:38 -0700
commitee396cf06dee0b6b036a1ea339040c75573db629 (patch)
tree09cb3c599cfc64670169d22c7762c5e95d7904d5
parent620b388c2aa33b19a7b5ad07f408a6dceb359f99 (diff)
qcacld-3.0: UMAC: Remove module specific log level check
Log level check is currently handled in QDF and hence we don't need another redundant check in UMAC modules. Change-Id: I86e7341ab3a634b50a4c4c2d70f6651e6e1f8de5 CRs-Fixed: 2020798
-rw-r--r--core/mac/src/cfg/cfg_debug.c18
-rw-r--r--core/mac/src/pe/lim/lim_debug.c18
-rw-r--r--core/mac/src/sys/legacy/src/system/src/sys_entry_func.c18
-rw-r--r--core/mac/src/sys/legacy/src/utils/src/log_api.c14
-rw-r--r--core/mac/src/sys/legacy/src/utils/src/parser_api.c15
-rw-r--r--core/sme/src/common/sme_api.c16
6 files changed, 28 insertions, 71 deletions
diff --git a/core/mac/src/cfg/cfg_debug.c b/core/mac/src/cfg/cfg_debug.c
index 7d09c91763d1..4cfa82870472 100644
--- a/core/mac/src/cfg/cfg_debug.c
+++ b/core/mac/src/cfg/cfg_debug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -40,18 +40,10 @@
void cfg_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
{
#ifdef WLAN_DEBUG
- /* Verify against current log level */
- if (loglevel >
- pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_CFG_MODULE_ID)])
- return;
- else {
- va_list marker;
+ va_list marker;
- va_start(marker, pString); /* Initialize variable arguments. */
-
- log_debug(pMac, SIR_CFG_MODULE_ID, loglevel, pString, marker);
-
- va_end(marker); /* Reset variable arguments. */
- }
+ va_start(marker, pString);
+ log_debug(pMac, SIR_CFG_MODULE_ID, loglevel, pString, marker);
+ va_end(marker);
#endif
}
diff --git a/core/mac/src/pe/lim/lim_debug.c b/core/mac/src/pe/lim/lim_debug.c
index 51620d78bf9d..665267c4c76f 100644
--- a/core/mac/src/pe/lim/lim_debug.c
+++ b/core/mac/src/pe/lim/lim_debug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -40,18 +40,10 @@
void lim_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
{
#ifdef WLAN_DEBUG
- /* Verify against current log level */
- if (loglevel >
- pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_LIM_MODULE_ID)])
- return;
- else {
- va_list marker;
+ va_list marker;
- va_start(marker, pString); /* Initialize variable arguments. */
-
- log_debug(pMac, SIR_LIM_MODULE_ID, loglevel, pString, marker);
-
- va_end(marker); /* Reset variable arguments. */
- }
+ va_start(marker, pString);
+ log_debug(pMac, SIR_LIM_MODULE_ID, loglevel, pString, marker);
+ va_end(marker);
#endif
}
diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
index 2df4bc7ef888..aa485572f70b 100644
--- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
+++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
@@ -226,17 +226,11 @@ fail:
void sys_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
{
- /* Verify against current log level */
- if (loglevel >
- pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_SYS_MODULE_ID)])
- return;
- else {
- va_list marker;
+#ifdef WLAN_DEBUG
+ va_list marker;
- va_start(marker, pString); /* Initialize variable arguments. */
-
- log_debug(pMac, SIR_SYS_MODULE_ID, loglevel, pString, marker);
-
- va_end(marker); /* Reset variable arguments. */
- }
+ va_start(marker, pString);
+ log_debug(pMac, SIR_SYS_MODULE_ID, loglevel, pString, marker);
+ va_end(marker);
+#endif
}
diff --git a/core/mac/src/sys/legacy/src/utils/src/log_api.c b/core/mac/src/sys/legacy/src/utils/src/log_api.c
index 521168c8f008..cd16d38631ae 100644
--- a/core/mac/src/sys/legacy/src/utils/src/log_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/log_api.c
@@ -118,17 +118,11 @@ void log_dbg(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel,
const char *pStr, ...)
{
#ifdef WLAN_DEBUG
- if (debugLevel > pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(modId)])
- return;
- else {
- va_list marker;
+ va_list marker;
- va_start(marker, pStr); /* Initialize variable arguments. */
-
- log_debug(pMac, modId, debugLevel, pStr, marker);
-
- va_end(marker); /* Reset variable arguments. */
- }
+ va_start(marker, pStr);
+ log_debug(pMac, modId, debugLevel, pStr, marker);
+ va_end(marker);
#endif
}
diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
index 1f96dfd348c6..3017858b748e 100644
--- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
@@ -53,18 +53,11 @@
void dot11f_log(tpAniSirGlobal pMac, int loglevel, const char *pString, ...)
{
#ifdef WLAN_DEBUG
- if ((uint32_t) loglevel >
- pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_DBG_MODULE_ID)]) {
- return;
- } else {
- va_list marker;
-
- va_start(marker, pString); /* Initialize variable arguments. */
+ va_list marker;
- log_debug(pMac, SIR_DBG_MODULE_ID, loglevel, pString, marker);
-
- va_end(marker); /* Reset variable arguments. */
- }
+ va_start(marker, pString);
+ log_debug(pMac, SIR_DBG_MODULE_ID, loglevel, pString, marker);
+ va_end(marker);
#endif
}
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index b9cf1f78a710..5953bb4bf294 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -5968,19 +5968,11 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId,
void sms_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
{
#ifdef WLAN_DEBUG
- /* Verify against current log level */
- if (loglevel >
- pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(SIR_SMS_MODULE_ID)])
- return;
- else {
- va_list marker;
-
- va_start(marker, pString); /* Initialize variable arguments. */
+ va_list marker;
- log_debug(pMac, SIR_SMS_MODULE_ID, loglevel, pString, marker);
-
- va_end(marker); /* Reset variable arguments. */
- }
+ va_start(marker, pString);
+ log_debug(pMac, SIR_SMS_MODULE_ID, loglevel, pString, marker);
+ va_end(marker);
#endif
}