summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgarwal Ashish <ashishka@qti.qualcomm.com>2015-08-03 15:29:21 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2015-08-24 17:55:27 +0530
commit929c31c391efffacdd588576337a05edc4b29ee3 (patch)
tree10d81eac8af4debf140927fd8ee8a78d5009c83b
parent6cd2968d38ab8fc96df5ad51f5fbae21ed98f4a6 (diff)
qcacld-2.0: Modify TDLS/pmc log for link setup/Teardown
prima to qcacld-2.0 propagation As a part of logging improvement, modify redundant logs, change certain log levels in TDLS link setup/ teardown path to make logs more useful. Some logs in PMC moudle also modified for better readability. Change-Id: Ibb0ee1edb5bbb1aed57bccbc15354031b0362198 CRs-Fixed: 861452
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c7
-rw-r--r--CORE/HDD/src/wlan_hdd_tdls.c3
-rw-r--r--CORE/MAC/src/pe/pmm/pmmApi.c2
-rw-r--r--CORE/SME/src/csr/csrTdlsProcess.c14
-rw-r--r--CORE/SME/src/pmc/pmc.c5
-rw-r--r--CORE/SME/src/pmc/pmcApi.c2
-rw-r--r--CORE/SME/src/sme_common/sme_Api.c3
7 files changed, 24 insertions, 12 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 8e5c7a5d4ab6..182fb980c918 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -20042,7 +20042,6 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
VOS_STATUS status;
unsigned long rc;
tCsrTdlsLinkEstablishParams tdlsLinkEstablishParams;
-
pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, TRUE);
if (NULL == pTdlsPeer)
@@ -20260,7 +20259,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
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;
}
}
@@ -20273,7 +20272,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
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;
}
}
@@ -20281,7 +20280,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
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 84e75868c671..8ce2981705ce 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -2704,6 +2704,9 @@ void wlan_hdd_tdls_indicate_teardown(hdd_adapter_t *pAdapter,
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("Indicating NL80211_TDLS_TEARDOWN to supplicant, 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 d7db0282cf5c..64212c1492c1 100644
--- a/CORE/MAC/src/pe/pmm/pmmApi.c
+++ b/CORE/MAC/src/pe/pmm/pmmApi.c
@@ -657,7 +657,7 @@ tSirRetStatus pmmSendInitPowerSaveMsg(tpAniSirGlobal pMac,tpPESession psessionE
(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 a0dffe8db581..e76e7e3884b1 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -140,6 +140,8 @@ eHalStatus csrTdlsSendMgmtReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSendMg
tdlsSendMgmtCmd->u.tdlsCmd.size = sizeof(tTdlsSendMgmtCmdInfo) ;
smePushCommand(pMac, tdlsSendMgmtCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsSendMgmtCmd to SME"));
}
}
@@ -207,6 +209,8 @@ eHalStatus csrTdlsChangePeerSta(tHalHandle hHal,
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 ;
}
}
@@ -263,6 +267,8 @@ VOS_STATUS csrTdlsSendLinkEstablishParams(tHalHandle hHal,
tdlsLinkEstablishCmd->u.tdlsCmd.size = sizeof(tTdlsLinkEstablishCmdInfo) ;
smePushCommand(pMac, tdlsLinkEstablishCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsLinkEstablishCmd to SME"));
}
}
@@ -302,6 +308,8 @@ eHalStatus csrTdlsAddPeerSta(tHalHandle hHal,
tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo) ;
smePushCommand(pMac, tdlsAddStaCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsAddStaCmd to SME"));
}
}
@@ -339,6 +347,8 @@ eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId,
tdlsDelStaCmd->u.tdlsCmd.size = sizeof(tTdlsDelStaCmdInfo) ;
smePushCommand(pMac, tdlsDelStaCmd, FALSE) ;
status = eHAL_STATUS_SUCCESS ;
+ smsLog( pMac, LOG1,
+ FL("Successfully posted tdlsDelStaCmd to SME"));
}
}
@@ -357,7 +367,7 @@ eHalStatus tdlsSendMessage(tpAniSirGlobal pMac, tANI_U16 msg_type,
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)
{
@@ -421,7 +431,7 @@ eHalStatus csrTdlsProcessSendMgmt( tpAniSirGlobal pMac, tSmeCmd *cmd )
}
// 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 391b0ba7f723..9dd91d13fbb2 100644
--- a/CORE/SME/src/pmc/pmc.c
+++ b/CORE/SME/src/pmc/pmc.c
@@ -164,8 +164,7 @@ eHalStatus pmcEnterFullPowerState (tHalHandle hHal)
{
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
- pmcLog(pMac, LOG2, FL("Entering pmcEnterFullPowerState"));
-
+ pmcLog(pMac, LOG1, FL("PMC state is %d"), pMac->pmc.pmcState);
/* Take action based on the current state. */
switch (pMac->pmc.pmcState)
{
@@ -833,7 +832,7 @@ void pmcDoCallbacks (tHalHandle hHal, eHalStatus callbackStatus)
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 81e1b147cbaa..bffe0e61f24d 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -1476,7 +1476,7 @@ void pmcMessageProcessor (tHalHandle hHal, tSirSmeRsp *pMsg)
{
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 008933afb320..7a105f25ca96 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -11389,7 +11389,6 @@ VOS_STATUS sme_DeleteTdlsPeerSta(tHalHandle hHal,
if ( HAL_STATUS_SUCCESS( status ) )
{
status = csrTdlsDelPeerSta(hHal, sessionId, peerMac) ;
-
sme_ReleaseGlobalLock( &pMac->sme );
}
@@ -11414,6 +11413,8 @@ void sme_SetTdlsPowerSaveProhibited(tHalHandle hHal, tANI_U32 sessionId, v_BOOL_
{
pmcOffloadSetTdlsProhibitBmpsStatus(hHal, sessionId, val);
}
+ smsLog(pMac, LOG1, FL("isTdlsPowerSaveProhibited is %d"),
+ pMac->isTdlsPowerSaveProhibited);
return;
}