wlan: MAC Address Logging Fix.
Use pre-defined macro's to log MAC addresses,
Updating macro's in few more places.
Change-Id: I9821b40b0ea09c41e3c3258709746c24b3705321
CRs-Fixed: 573100
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 2174d2d..491691c 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -8965,10 +8965,8 @@
roamTS2 = vos_timer_get_system_time();
roamInfo.tsmRoamDelay = roamTS2 - pSession->roamTS1;
- smsLog(pMac, LOG1, "Bssid(%02X:%02X:%02X:%02X:%02X:%02X) Roaming Delay(%u ms)",
- pSession->connectedProfile.bssid[0], pSession->connectedProfile.bssid[1],
- pSession->connectedProfile.bssid[2], pSession->connectedProfile.bssid[3],
- pSession->connectedProfile.bssid[4], pSession->connectedProfile.bssid[5],
+ smsLog(pMac, LOG1, "Bssid("MAC_ADDRESS_STR") Roaming Delay(%u ms)",
+ MAC_ADDR_ARRAY(pSession->connectedProfile.bssid),
roamInfo.tsmRoamDelay);
pSessionEntry = peFindSessionByBssid(pMac, pSession->connectedProfile.bssid, &sessionId);
@@ -9824,9 +9822,9 @@
else
{
result = eCSR_ROAM_RESULT_FAILURE;
- smsLog( pMac, LOGE, "CSR: Roam Completion setkey command failed(%d) PeerMac %02X-%02X-%02X-%02X-%02X-%02X...",
- pRsp->statusCode, pRsp->peerMacAddr[0], pRsp->peerMacAddr[1], pRsp->peerMacAddr[2],
- pRsp->peerMacAddr[3], pRsp->peerMacAddr[4], pRsp->peerMacAddr[5] );
+ smsLog(pMac, LOGE, "CSR: Roam Completion setkey "
+ "command failed(%d) PeerMac "MAC_ADDRESS_STR,
+ pRsp->statusCode, MAC_ADDR_ARRAY(pRsp->peerMacAddr));
}
csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.setKeyCmd.roamId,
eCSR_ROAM_SET_KEY_COMPLETE, result);
@@ -11818,8 +11816,8 @@
{
for( Index=0; Index < pSession->NumPmkidCache; Index++ )
{
- smsLog(pMac, LOGW, "Delete PMKID for %02X-%02X-%02X-%02X-%02X-%02X ",
- pBSSId[0], pBSSId[1], pBSSId[2], pBSSId[3], pBSSId[4], pBSSId[5]);
+ smsLog(pMac, LOGW, "Delete PMKID for "
+ MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pBSSId));
if( palEqualMemory( pMac->hHdd, pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid) ) )
{
fMatchFound = TRUE;
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index bfbfa4e..efb8d46 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -1954,13 +1954,9 @@
}//Have scan result
else
{
- smsLog(pMac, LOGW, FL("cannot find matching BSS of %02X-%02X-%02X-%02X-%02X-%02X"),
- pSession->connectedProfile.bssid[0],
- pSession->connectedProfile.bssid[1],
- pSession->connectedProfile.bssid[2],
- pSession->connectedProfile.bssid[3],
- pSession->connectedProfile.bssid[4],
- pSession->connectedProfile.bssid[5]);
+ smsLog(pMac, LOGW, FL("cannot find matching BSS of "
+ MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pSession->connectedProfile.bssid));
//Disconnect
csrRoamDisconnectInternal(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED);
}
@@ -2216,17 +2212,13 @@
/* re-assign preference value based on modified rssi bucket */
pBssDesc->preferValue = csrGetBssPreferValue(pMac, (int)pBssDesc->Result.BssDescriptor.rssi);
- smsLog(pMac, LOG2, FL("BSSID(%02X:%02X:%02X:%02X:%02X:%02X) Rssi(%d) Chnl(%d) PrefVal(%lu) SSID=%.*s"),
- pBssDesc->Result.BssDescriptor.bssId[0],
- pBssDesc->Result.BssDescriptor.bssId[1],
- pBssDesc->Result.BssDescriptor.bssId[2],
- pBssDesc->Result.BssDescriptor.bssId[3],
- pBssDesc->Result.BssDescriptor.bssId[4],
- pBssDesc->Result.BssDescriptor.bssId[5],
- pBssDesc->Result.BssDescriptor.rssi,
- pBssDesc->Result.BssDescriptor.channelId,
- pBssDesc->preferValue,
- pBssDesc->Result.ssId.length, pBssDesc->Result.ssId.ssId);
+ smsLog(pMac, LOG2, FL("BSSID("MAC_ADDRESS_STR
+ ") Rssi(%d) Chnl(%d) PrefVal(%lu) SSID=%.*s"),
+ MAC_ADDR_ARRAY(pBssDesc->Result.BssDescriptor.bssId),
+ pBssDesc->Result.BssDescriptor.rssi,
+ pBssDesc->Result.BssDescriptor.channelId,
+ pBssDesc->preferValue,
+ pBssDesc->Result.ssId.length, pBssDesc->Result.ssId.ssId);
pEntry = csrLLNext(&pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK);
}
@@ -4083,9 +4075,10 @@
csrFreeScanFilter( pMac, &filter );
if(fMatch)
{
- smsLog(pMac, LOGW, " Matching roam profile BSSID %02X-%02X-%02X-%02X-%02X-%02X causing ambiguous domain info",
- pSirBssDesc->bssId[0], pSirBssDesc->bssId[1], pSirBssDesc->bssId[2],
- pSirBssDesc->bssId[3], pSirBssDesc->bssId[4], pSirBssDesc->bssId[5]);
+ smsLog(pMac, LOGW, "Matching roam profile "
+ "BSSID " MAC_ADDRESS_STR
+ " causing ambiguous domain info",
+ MAC_ADDR_ARRAY(pSirBssDesc->bssId));
pMac->scan.fAmbiguous11dInfoFound = eANI_BOOLEAN_TRUE;
break;
}
@@ -4097,9 +4090,10 @@
//User doesn't give profile and just connect to anything.
if(csrMatchBSSToConnectProfile(pMac, &pSession->connectedProfile, pSirBssDesc, pIesLocal))
{
- smsLog(pMac, LOGW, " Matching connect profile BSSID %02X-%02X-%02X-%02X-%02X-%02X causing ambiguous domain info",
- pSirBssDesc->bssId[0], pSirBssDesc->bssId[1], pSirBssDesc->bssId[2],
- pSirBssDesc->bssId[3], pSirBssDesc->bssId[4], pSirBssDesc->bssId[5]);
+ smsLog(pMac, LOGW, "Matching connect profile BSSID "
+ MAC_ADDRESS_STR
+ " causing ambiguous domain info",
+ MAC_ADDR_ARRAY(pSirBssDesc->bssId));
//Tush
pMac->scan.fAmbiguous11dInfoFound = eANI_BOOLEAN_TRUE;
if(csrIsBssidMatch(pMac, (tCsrBssid *)&pSirBssDesc->bssId,
@@ -5298,14 +5292,9 @@
pSession->pConnectBssDesc, NULL, FALSE))
)
{
- smsLog(pMac, LOGW, "Aging out BSS %02X-%02X-%02X-%02X-%02X-%02X Channel %d",
- pResult->Result.BssDescriptor.bssId[0],
- pResult->Result.BssDescriptor.bssId[1],
- pResult->Result.BssDescriptor.bssId[2],
- pResult->Result.BssDescriptor.bssId[3],
- pResult->Result.BssDescriptor.bssId[4],
- pResult->Result.BssDescriptor.bssId[5],
- pResult->Result.BssDescriptor.channelId);
+ smsLog(pMac, LOGW, "Aging out BSS "MAC_ADDRESS_STR" Channel %d",
+ MAC_ADDR_ARRAY(pResult->Result.BssDescriptor.bssId),
+ pResult->Result.BssDescriptor.channelId);
//No need to hold the spin lock because caller should hold the lock for pMac->scan.scanResultList
if( csrLLRemoveEntry(&pMac->scan.scanResultList, &pResult->Link, LL_ACCESS_NOLOCK) )
{
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index c05fa99..1164dd6 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -3742,8 +3742,8 @@
{
for( Index=0; Index < pSession->NumPmkidCache; Index++ )
{
- smsLog(pMac, LOGW, "match PMKID %02X-%02X-%02X-%02X-%02X-%02X to ",
- pBSSId[0], pBSSId[1], pBSSId[2], pBSSId[3], pBSSId[4], pBSSId[5]);
+ smsLog(pMac, LOGW, "match PMKID "MAC_ADDRESS_STR " to ",
+ MAC_ADDR_ARRAY(pBSSId));
if( vos_mem_compare(pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid)) )
{
// match found
@@ -4028,8 +4028,8 @@
{
for( Index=0; Index < pSession->NumBkidCache; Index++ )
{
- smsLog(pMac, LOGW, "match BKID %02X-%02X-%02X-%02X-%02X-%02X to ",
- pBSSId[0], pBSSId[1], pBSSId[2], pBSSId[3], pBSSId[4], pBSSId[5]);
+ smsLog(pMac, LOGW, "match BKID "MAC_ADDRESS_STR" to ",
+ MAC_ADDR_ARRAY(pBSSId));
if (vos_mem_compare(pBSSId, pSession->BkidCacheInfo[Index].BSSID, sizeof(tCsrBssid) ) )
{
// match found