prima: TDLS log Enhancement to route log to desired buffer
Remove WLAN_FEATURE_TDLS_DEBUG Macro definition since it is no more
required and replace TDLS_LOG_LEVEL with appropriate log level to
achieve the following.
Route
1. Error messages to kmsg and logger app
2. Info messages to Logger app.
Change-Id: I86acf09dbd05af68ca759a9527786b55c86d8c65
CRs-Fixed: 803640
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index dc072d8..c136996 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -132,12 +132,6 @@
.flags = flag, \
}
-#ifndef WLAN_FEATURE_TDLS_DEBUG
-#define TDLS_LOG_LEVEL VOS_TRACE_LEVEL_INFO
-#else
-#define TDLS_LOG_LEVEL VOS_TRACE_LEVEL_ERROR
-#endif
-
#ifdef WLAN_FEATURE_VOWIFI_11R
#define WLAN_AKM_SUITE_FT_8021X 0x000FAC03
#define WLAN_AKM_SUITE_FT_PSK 0x000FAC04
@@ -8223,7 +8217,7 @@
if ((eTDLS_SUPPORT_NOT_ENABLED == pHddCtx->tdls_mode) ||
(eTDLS_SUPPORT_DISABLED == pHddCtx->tdls_mode))
{
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: TDLS mode is disabled OR not enabled in FW."
MAC_ADDRESS_STR " Request declined.",
__func__, MAC_ADDR_ARRAY(mac));
@@ -8244,7 +8238,7 @@
pTdlsPeer = wlan_hdd_tdls_get_peer(pAdapter, mac);
if ( NULL == pTdlsPeer ) {
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR " (update %d) not exist. return invalid",
__func__, MAC_ADDR_ARRAY(mac), update);
return -EINVAL;
@@ -8255,7 +8249,7 @@
((pTdlsPeer->link_status >= eTDLS_LINK_CONNECTING) ||
(TDLS_STA_INDEX_VALID(pTdlsPeer->staId))))
{
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: " MAC_ADDRESS_STR
" link_status %d. staId %d. add station ignored.",
__func__, MAC_ADDR_ARRAY(mac), pTdlsPeer->link_status, pTdlsPeer->staId);
@@ -8266,7 +8260,7 @@
((pTdlsPeer->link_status > eTDLS_LINK_CONNECTING) ||
(!TDLS_STA_INDEX_VALID(pTdlsPeer->staId))))
{
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR
" link status %d. staId %d. change station %s.",
__func__, MAC_ADDR_ARRAY(mac), pTdlsPeer->link_status, pTdlsPeer->staId,
@@ -8319,23 +8313,23 @@
/* debug code */
if (NULL != StaParams)
{
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: TDLS Peer Parameters.", __func__);
if(StaParams->htcap_present)
{
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"ht_capa->cap_info: %0x", StaParams->HTCap.capInfo);
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"ht_capa->extended_capabilities: %0x",
StaParams->HTCap.extendedHtCapInfo);
}
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"params->capability: %0x",StaParams->capability);
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"params->ext_capab_len: %0x",StaParams->extn_capability[0]);
if(StaParams->vhtcap_present)
{
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"rxMcsMap %x rxHighest %x txMcsMap %x txHighest %x",
StaParams->VHTCap.suppMcs.rxMcsMap, StaParams->VHTCap.suppMcs.rxHighest,
StaParams->VHTCap.suppMcs.txMcsMap, StaParams->VHTCap.suppMcs.txHighest);
@@ -8344,7 +8338,7 @@
int i = 0;
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "Supported rates:");
for (i = 0; i < sizeof(StaParams->supported_rates); i++)
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"[%d]: %x ", i, StaParams->supported_rates[i]);
}
} /* end debug code */
@@ -12081,7 +12075,7 @@
{
uint8 *mac;
mac = pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes;
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: call sme_DeleteTdlsPeerSta staId %d sessionId %d " MAC_ADDRESS_STR,
__func__, pHddCtx->tdlsConnInfo[staIdx].staId, pAdapter->sessionId,
MAC_ADDR_ARRAY(mac));
@@ -13560,11 +13554,9 @@
set = params->sta_flags_set;
-#ifdef WLAN_FEATURE_TDLS_DEBUG
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: mask 0x%x set 0x%x " MAC_ADDRESS_STR,
__func__, mask, set, MAC_ADDR_ARRAY(mac));
-#endif
if (mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
if (set & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
@@ -14478,7 +14470,7 @@
}
if (eTDLS_SUPPORT_NOT_ENABLED == pHddCtx->tdls_mode)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: TDLS mode is disabled OR not enabled in FW."
MAC_ADDRESS_STR " action %d declined.",
__func__, MAC_ADDR_ARRAY(peer), action_code);
@@ -14491,7 +14483,7 @@
/* if tdls_mode is disabled to respond to peer's request */
if (eTDLS_SUPPORT_DISABLED == pHddCtx->tdls_mode)
{
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: " MAC_ADDRESS_STR
" TDLS mode is disabled. action %d declined.",
__func__, MAC_ADDR_ARRAY(peer), action_code);
@@ -14567,12 +14559,10 @@
}
vos_mem_copy(peerMac, peer, 6);
-#ifdef WLAN_FEATURE_TDLS_DEBUG
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: " MAC_ADDRESS_STR " action %d, dialog_token %d status %d, len = %zu",
"tdls_mgmt", MAC_ADDR_ARRAY(peer),
action_code, dialog_token, status_code, len);
-#endif
/*Except teardown responder will not be used so just make 0*/
responder = 0;
@@ -14602,7 +14592,7 @@
{
if (TRUE == sme_IsPmcBmps(WLAN_HDD_GET_HAL_CTX(pAdapter)))
{
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: Sending frame action_code %u.Disable BMPS", __func__, action_code);
hdd_disable_bmps_imps(pHddCtx, WLAN_HDD_INFRA_STATION);
}