wlan: Modify TDLS log for link setup/Teardown
As a part of logging improvement, modify redundant
logs, change certain log levels in TDLS link setup/
teardown path to make logs more useful.
Change-Id: Ibb0ee1edb5bbb1aed57bccbc15354031b0362198
CRs-Fixed: 861452
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 40f4435..a0c899e 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -15162,7 +15162,7 @@
if ( NULL == pTdlsPeer ) {
hddLog(VOS_TRACE_LEVEL_INFO, "%s: " MAC_ADDRESS_STR
- " peer not exsting",
+ " peer not existing",
__func__, MAC_ADDR_ARRAY(peer));
return -EINVAL;
}
@@ -15249,6 +15249,9 @@
hddTdlsPeer_t *connPeer = NULL;
tANI_U8 suppChannelLen = 0;
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ " %s : NL80211_TDLS_ENABLE_LINK for " MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(peer));
pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, TRUE);
memset(&staDesc, 0, sizeof(staDesc));
if ( NULL == pTdlsPeer ) {
@@ -15298,7 +15301,8 @@
TDLS_OFF_CHANNEL_BW_OFFSET,
TDLS_CHANNEL_SWITCH_DISABLE);
if (ret != VOS_STATUS_SUCCESS) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("Failed to send TDLS switch channel request"));
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("Failed to send TDLS switch channel request"));
}
}
else
@@ -15343,8 +15347,8 @@
if (ret <= 0)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Link Establish Request Faled Status %ld",
- __func__, ret);
+ FL("Link Establish Request Failed Status %ld"),
+ ret);
return -EINVAL;
}
}
@@ -15489,8 +15493,13 @@
tANI_U16 numCurrTdlsPeers = 0;
hddTdlsPeer_t *connPeer = NULL;
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ " %s : NL80211_TDLS_DISABLE_LINK for " MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(peer));
+
pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, TRUE);
+
if ( NULL == pTdlsPeer ) {
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR
" (oper %d) not exsting. ignored",
@@ -15590,7 +15599,7 @@
if (0 != status)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Error in TDLS Teardown", __func__);
+ FL("Error in TDLS Teardown"));
return status;
}
break;
@@ -15605,7 +15614,7 @@
if (0 != status)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Error in TDLS Setup", __func__);
+ FL("Error in TDLS Setup"));
return status;
}
break;
@@ -15613,7 +15622,7 @@
case NL80211_TDLS_DISCOVERY_REQ:
/* We don't support in-driver setup/teardown/discovery */
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "%s: We don't support in-driver setup/teardown/discovery "
+ "%s: Driver doesn't support in-driver setup/teardown/discovery "
,__func__);
return -ENOTSUPP;
default:
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index f3ce0f7..cfcb7d0 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -2975,6 +2975,8 @@
wlan_hdd_tdls_set_peer_link_status(curr_peer,
eTDLS_LINK_TEARING,
eTDLS_LINK_UNSPECIFIED);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("Setting NL80211_TDLS_TEARDOWN, reason %d"), reason);
cfg80211_tdls_oper_request(pAdapter->dev,
curr_peer->peerMac,
NL80211_TDLS_TEARDOWN,
diff --git a/CORE/MAC/src/pe/pmm/pmmApi.c b/CORE/MAC/src/pe/pmm/pmmApi.c
index c7a7062..4b8e8da 100644
--- a/CORE/MAC/src/pe/pmm/pmmApi.c
+++ b/CORE/MAC/src/pe/pmm/pmmApi.c
@@ -677,7 +677,7 @@
(tANI_U8)GET_MIN_VALUE((tANI_U8) numBeaconPerRssiAverage, WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE_STAMAX);
pmmLog (pMac, LOG1,
- "%s: [INFOLOG]RssiFilterInfo..%d %x %x", __func__, (int)pBmpsParams->bRssiFilterEnable,
+ "%s: RssiFilterInfo..%d %x %x", __func__, (int)pBmpsParams->bRssiFilterEnable,
(unsigned int)pBmpsParams->rssiFilterPeriod, (unsigned int)pBmpsParams->numBeaconPerRssiAverage);
msgQ.type = WDA_ENTER_BMPS_REQ;
diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c
index 50531e8..06596a6 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -144,6 +144,8 @@
tdlsSendMgmtCmd->u.tdlsCmd.size = sizeof(tTdlsSendMgmtCmdInfo) ;
smePushCommand(pMac, tdlsSendMgmtCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsSendMgmtCmd to SME"));
}
}
@@ -214,6 +216,8 @@
tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer;
tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo) ;
smePushCommand(pMac, tdlsAddStaCmd, FALSE) ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsAddStaCmd to SME to modify peer "));
status = eHAL_STATUS_SUCCESS ;
}
}
@@ -274,6 +278,8 @@
tdlsLinkEstablishCmd->u.tdlsCmd.size = sizeof(tTdlsLinkEstablishCmdInfo) ;
smePushCommand(pMac, tdlsLinkEstablishCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsLinkEstablishCmd to SME"));
}
}
@@ -313,6 +319,8 @@
tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo) ;
smePushCommand(pMac, tdlsAddStaCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsAddStaCmd to SME"));
}
}
@@ -351,6 +359,8 @@
tdlsDelStaCmd->u.tdlsCmd.size = sizeof(tTdlsDelStaCmdInfo) ;
smePushCommand(pMac, tdlsDelStaCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsDelStaCmd to SME"));
}
}
@@ -398,6 +408,8 @@
tdlsChanSwitchCmd->u.tdlsCmd.size = sizeof(tTdlsChanSwitchCmdInfo) ;
smePushCommand(pMac, tdlsChanSwitchCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsChanSwitchCmd to SME"));
}
}
@@ -417,7 +429,7 @@
pMsg->msgLen = (tANI_U16) (msg_size) ;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- ("sending msg = %d"), pMsg->type) ;
+ FL("sending msg = %d"), pMsg->type) ;
/* Send message. */
if (palSendMBMessage(pMac->hHdd, pMsg) != eHAL_STATUS_SUCCESS)
{
@@ -481,7 +493,7 @@
}
// Send the request to PE.
- smsLog( pMac, LOG1, "sending TDLS Mgmt Frame req to PE " );
+ smsLog( pMac, LOG1, FL("sending TDLS Mgmt Frame req to PE " ));
status = tdlsSendMessage(pMac, eWNI_SME_TDLS_SEND_MGMT_REQ,
(void *)tdlsSendMgmtReq , sizeof(tSirTdlsSendMgmtReq)+tdlsSendMgmtCmdInfo->len) ;
if(!HAL_STATUS_SUCCESS( status ) )
diff --git a/CORE/SME/src/pmc/pmc.c b/CORE/SME/src/pmc/pmc.c
index 45a55ec..9ff5208 100644
--- a/CORE/SME/src/pmc/pmc.c
+++ b/CORE/SME/src/pmc/pmc.c
@@ -163,7 +163,7 @@
{
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
- pmcLog(pMac, LOG1, FL("Enter. PMC state is %d"), pMac->pmc.pmcState);
+ pmcLog(pMac, LOG1, FL("PMC state is %d"), pMac->pmc.pmcState);
/* Take action based on the current state. */
switch (pMac->pmc.pmcState)
@@ -841,7 +841,7 @@
tListElem *pEntry;
tpRequestFullPowerEntry pRequestFullPowerEntry;
- pmcLog(pMac, LOG2, FL("Entering pmcDoCallbacks"));
+ pmcLog(pMac, LOG2, FL("Enter"));
/* Call IMPS callback routine. */
if (pMac->pmc.impsCallbackRoutine != NULL)
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index ac13d3a..6f7a00c 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -1580,7 +1580,7 @@
{
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
- pmcLog(pMac, LOG2, FL("Entering pmcMessageProcessor, message type %d"), pMsg->messageType);
+ pmcLog(pMac, LOG2, FL("Message type %d"), pMsg->messageType);
switch( pMsg->messageType )
{
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index c66ce96..2703efd 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -10590,7 +10590,6 @@
if ( HAL_STATUS_SUCCESS( status ) )
{
status = csrTdlsDelPeerSta(hHal, sessionId, peerMac) ;
-
sme_ReleaseGlobalLock( &pMac->sme );
}
@@ -10608,6 +10607,8 @@
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
pMac->isTdlsPowerSaveProhibited = val;
+ smsLog(pMac, LOG1, FL("isTdlsPowerSaveProhibited is %d"),
+ pMac->isTdlsPowerSaveProhibited);
return;
}
#endif