wlan: MAC Address Logging Fix.
Use pre-defined macro's to log MAC addresses.
Change-Id: Ia48be0eb3f4efe0f4f66752b852fe84bbe2e3344
CRs-Fixed: 573100
diff --git a/CORE/SME/src/btc/btcApi.c b/CORE/SME/src/btc/btcApi.c
index 7f2fb6d..d2dfc45 100644
--- a/CORE/SME/src/btc/btcApi.c
+++ b/CORE/SME/src/btc/btcApi.c
@@ -1972,13 +1972,10 @@
pMac->btc.btcBssfordisableaggr[3] = pSmeCoexInd->coexIndData[1] >> 8;
pMac->btc.btcBssfordisableaggr[4] = pSmeCoexInd->coexIndData[2] & 0xFF;
pMac->btc.btcBssfordisableaggr[5] = pSmeCoexInd->coexIndData[2] >> 8;
- smsLog(pMac, LOGW,
- "Coex indication in %s(), \
- type - SIR_COEX_IND_TYPE_DISABLE_AGGREGATION_IN_2p4 \
- for BSSID %02x:%02x:%02x:%02x:%02x:%02x",__func__,
- pMac->btc.btcBssfordisableaggr[0],pMac->btc.btcBssfordisableaggr[1],
- pMac->btc.btcBssfordisableaggr[2],pMac->btc.btcBssfordisableaggr[3],
- pMac->btc.btcBssfordisableaggr[4],pMac->btc.btcBssfordisableaggr[5]);
+ smsLog(pMac, LOGW, "Coex indication in %s(), "
+ "type - SIR_COEX_IND_TYPE_DISABLE_AGGREGATION_IN_2p4 "
+ "for BSSID "MAC_ADDRESS_STR,__func__,
+ MAC_ADDR_ARRAY(pMac->btc.btcBssfordisableaggr));
}
}
else if (pSmeCoexInd->coexIndType == SIR_COEX_IND_TYPE_ENABLE_AGGREGATION_IN_2p4)
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 361a064..47dabbe 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -2501,9 +2501,9 @@
}
- smsLog( pMac, LOG2, "CSR Attempting to Disassociate Bssid=%02x-%02x-%02x-%02x-%02x-%02x"
- "subState = %d reason=%d", bssId[ 0 ], bssId[ 1 ], bssId[ 2 ], bssId[ 3 ],
- bssId[ 4 ], bssId[ 5 ], NewSubstate, reasonCode);
+ smsLog( pMac, LOG2, "CSR Attempting to Disassociate Bssid="MAC_ADDRESS_STR
+ " subState = %d reason=%d",
+ MAC_ADDR_ARRAY(bssId), NewSubstate, reasonCode);
csrRoamSubstateChange( pMac, NewSubstate, sessionId);
@@ -2632,9 +2632,8 @@
smsLog( pMac, LOGE, "csrRoamIssueTkipCounterMeasures:Connected BSS Description in CSR Session not found");
return (status);
}
- smsLog( pMac, LOG2, "CSR issuing tkip counter measures for Bssid = %02x-%02x-%02x-%02x-%02x-%02x, Enable = %d",
- bssId[ 0 ], bssId[ 1 ], bssId[ 2 ],
- bssId[ 3 ], bssId[ 4 ], bssId[ 5 ], bEnable);
+ smsLog( pMac, LOG2, "CSR issuing tkip counter measures for Bssid = "MAC_ADDRESS_STR", Enable = %d",
+ MAC_ADDR_ARRAY(bssId), bEnable);
status = csrSendMBTkipCounterMeasuresReqMsg( pMac, sessionId, bEnable, bssId );
return (status);
}
@@ -2660,9 +2659,8 @@
smsLog( pMac, LOGE, "csrRoamGetAssociatedStas:Connected BSS Description in CSR Session not found");
return (status);
}
- smsLog( pMac, LOG2, "CSR getting associated stations for Bssid = %02x-%02x-%02x-%02x-%02x-%02x",
- bssId[ 0 ], bssId[ 1 ], bssId[ 2 ],
- bssId[ 3 ], bssId[ 4 ], bssId[ 5 ] );
+ smsLog( pMac, LOG2, "CSR getting associated stations for Bssid = "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(bssId));
status = csrSendMBGetAssociatedStasReqMsg( pMac, sessionId, modId, bssId, pUsrContext, pfnSapEventCallback, pAssocStasBuf );
return (status);
}
@@ -2688,9 +2686,8 @@
smsLog( pMac, LOGE, "csrRoamGetWpsSessionOverlap:Connected BSS Description in CSR Session not found");
return (status);
}
- smsLog( pMac, LOG2, "CSR getting WPS Session Overlap for Bssid = %02x-%02x-%02x-%02x-%02x-%02x",
- bssId[ 0 ], bssId[ 1 ], bssId[ 2 ],
- bssId[ 3 ], bssId[ 4 ], bssId[ 5 ] );
+ smsLog( pMac, LOG2, "CSR getting WPS Session Overlap for Bssid = "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(bssId));
status = csrSendMBGetWPSPBCSessions( pMac, sessionId, bssId, pUsrContext, pfnSapEventCallback, pRemoveMac);
@@ -2712,9 +2709,8 @@
{
vos_mem_copy(&bssId, pSession->pConnectBssDesc->bssId, sizeof(tCsrBssid));
}
- smsLog( pMac, LOG2, "CSR Attempting to Deauth Bssid= %02x-%02x-%02x-%02x-%02x-%02x",
- bssId[ 0 ], bssId[ 1 ], bssId[ 2 ],
- bssId[ 3 ], bssId[ 4 ], bssId[ 5 ] );
+ smsLog( pMac, LOG2, "CSR Attempting to Deauth Bssid= "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(bssId));
csrRoamSubstateChange( pMac, NewSubstate, sessionId);
status = csrSendMBDeauthReqMsg( pMac, sessionId, bssId, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON );
@@ -7167,9 +7163,8 @@
tCsrRoamProfile *pProfile, tANI_U32 roamId )
{
eHalStatus status;
- smsLog( pMac, LOG1, "Attempting to Join Bssid= %02x-%02x-%02x-%02x-%02x-%02x",
- pSirBssDesc->bssId[ 0 ],pSirBssDesc->bssId[ 1 ],pSirBssDesc->bssId[ 2 ],
- pSirBssDesc->bssId[ 3 ],pSirBssDesc->bssId[ 4 ],pSirBssDesc->bssId[ 5 ] );
+ smsLog( pMac, LOG1, "Attempting to Join Bssid= "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pSirBssDesc->bssId));
// Set the roaming substate to 'join attempt'...
csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_JOIN_REQ, sessionId);
@@ -8392,14 +8387,9 @@
//in this case, put it to the end of the Q incase there is a set key pending.
fImediate = eANI_BOOLEAN_FALSE;
}
- smsLog( pMac, LOGE, FL("keyType=%d, keyId=%d, PeerMac=%02x, %02x, %02x, %02x, %02x, %02x"),
+ smsLog( pMac, LOGE, FL("keyType=%d, keyId=%d, PeerMac="MAC_ADDRESS_STR),
pRemoveKey->encType, pRemoveKey->keyId,
- pCommand->u.removeKeyCmd.peerMac[0],
- pCommand->u.removeKeyCmd.peerMac[1],
- pCommand->u.removeKeyCmd.peerMac[2],
- pCommand->u.removeKeyCmd.peerMac[3],
- pCommand->u.removeKeyCmd.peerMac[4],
- pCommand->u.removeKeyCmd.peerMac[5]);
+ MAC_ADDR_ARRAY(pCommand->u.removeKeyCmd.peerMac));
status = csrQueueSmeCommand(pMac, pCommand, fImediate);
if( !HAL_STATUS_SUCCESS( status ) )
{
@@ -9006,9 +8996,8 @@
pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED;
pMsg->length = len;
vos_mem_copy(pMsg->bssId, bssId, sizeof(tSirMacAddr));
- smsLog( pMac, LOG1, FL("CSR reset caps change for Bssid= %02x-%02x-%02x-%02x-%02x-%02x"),
- pMsg->bssId[ 0 ], pMsg->bssId[ 1 ], pMsg->bssId[ 2 ],
- pMsg->bssId[ 3 ], pMsg->bssId[ 4 ], pMsg->bssId[ 5 ]);
+ smsLog( pMac, LOG1, FL("CSR reset caps change for Bssid= "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pMsg->bssId));
status = palSendMBMessage(pMac->hHdd, pMsg);
}
else
@@ -13104,9 +13093,8 @@
// bssId
vos_mem_copy((tSirMacAddr *)pMsg->bssId, &pSession->selfMacAddr,
sizeof(tSirMacAddr));
- smsLog( pMac, LOG1, FL("CSR Attempting to change BI for Bssid= %02x-%02x-%02x-%02x-%02x-%02x "),
- pMsg->bssId[ 0 ], pMsg->bssId[ 1 ], pMsg->bssId[ 2 ],
- pMsg->bssId[ 3 ], pMsg->bssId[ 4 ], pMsg->bssId[ 5 ] );
+ smsLog( pMac, LOG1, FL("CSR Attempting to change BI for Bssid= "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pMsg->bssId));
pMsg->sessionId = sessionId;
smsLog(pMac, LOG1, FL(" session %d BeaconInterval %d"), sessionId, pMac->roam.roamSession[sessionId].bssParams.beaconInterval);
pMsg->beaconInterval = pMac->roam.roamSession[sessionId].bssParams.beaconInterval;
@@ -13826,13 +13814,8 @@
pMsg->currDeviceMode = pAddStaReq->currDeviceMode;
- smsLog( pMac, LOG1, FL("selfMac=%02x, %02x, %02x, %02x, %02x, %02x"),
- pMsg->selfMacAddr[0],
- pMsg->selfMacAddr[1],
- pMsg->selfMacAddr[2],
- pMsg->selfMacAddr[3],
- pMsg->selfMacAddr[4],
- pMsg->selfMacAddr[5]);
+ smsLog( pMac, LOG1, FL("selfMac="MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pMsg->selfMacAddr));
status = palSendMBMessage(pMac->hHdd, pMsg);
} while( 0 );
return( status );
@@ -14248,9 +14231,8 @@
/* Update the current BSS info in ho control block based on connected
profile info from pmac global structure */
- smsLog(pMac, LOGW, " csrRoamLinkUp: WLAN link UP with AP= %02x-%02x-%02x-%02x-%02x-%02x",
- bssid[ 0 ], bssid[ 1 ], bssid[ 2 ],
- bssid[ 3 ], bssid[ 4 ], bssid[ 5 ] );
+ smsLog(pMac, LOGW, " csrRoamLinkUp: WLAN link UP with AP= "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(bssid));
/* Check for user misconfig of RSSI trigger threshold */
pMac->roam.configParam.vccRssiThreshold =
( 0 == pMac->roam.configParam.vccRssiThreshold ) ?
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 9de0846..193cec7 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -2979,10 +2979,8 @@
{
pBssDescription = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
- smsLog( pMac, LOGW, "...Bssid= %02x-%02x-%02x-%02x-%02x-%02x chan= %d, rssi = -%d",
- pBssDescription->Result.BssDescriptor.bssId[ 0 ], pBssDescription->Result.BssDescriptor.bssId[ 1 ],
- pBssDescription->Result.BssDescriptor.bssId[ 2 ], pBssDescription->Result.BssDescriptor.bssId[ 3 ],
- pBssDescription->Result.BssDescriptor.bssId[ 4 ], pBssDescription->Result.BssDescriptor.bssId[ 5 ],
+ smsLog( pMac, LOGW, "...Bssid= "MAC_ADDRESS_STR" chan= %d, rssi = -%d",
+ MAC_ADDR_ARRAY(pBssDescription->Result.BssDescriptor.bssId),
pBssDescription->Result.BssDescriptor.channelId,
pBssDescription->Result.BssDescriptor.rssi * (-1) );
@@ -8026,11 +8024,9 @@
vos_mem_copy((tANI_U8 *) &pBssDescr->bssId, (tANI_U8 *) macHeader->bssId, sizeof(tSirMacAddr));
pBssDescr->nReceivedTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
- smsLog( pMac, LOG2, "(%s):Bssid= %02x-%02x-%02x-%02x-%02x-%02x "
- "chan= %d, rssi = %d", __func__,
- pBssDescr->bssId[ 0 ], pBssDescr->bssId[ 1 ],
- pBssDescr->bssId[ 2 ], pBssDescr->bssId[ 3 ],
- pBssDescr->bssId[ 4 ], pBssDescr->bssId[ 5 ],
+ smsLog( pMac, LOG2, "(%s):Bssid= "MAC_ADDRESS_STR
+ " chan= %d, rssi = %d", __func__,
+ MAC_ADDR_ARRAY(pBssDescr->bssId),
pBssDescr->channelId,
pBssDescr->rssi );
@@ -8155,17 +8151,11 @@
return status;
}
smsLog(pMac, LOG2, FL("csrScanCreateEntryInScanCache: Current bssid::"
- "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x"),
- pSession->pConnectBssDesc->bssId[0],
- pSession->pConnectBssDesc->bssId[1],
- pSession->pConnectBssDesc->bssId[2],
- pSession->pConnectBssDesc->bssId[3],
- pSession->pConnectBssDesc->bssId[4],
- pSession->pConnectBssDesc->bssId[5]);
+ MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pSession->pConnectBssDesc->bssId));
smsLog(pMac, LOG2, FL("csrScanCreateEntryInScanCache: My bssid::"
- "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x channel %d"),
- bssid[0],bssid[1],bssid[2],
- bssid[3],bssid[4],bssid[5],channel);
+ MAC_ADDRESS_STR" channel %d"),
+ MAC_ADDR_ARRAY(bssid), channel);
do
{
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index 3fb7fee..4080bb3 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -909,8 +909,8 @@
{
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
- NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL(" Added BSSID %02x:%02x:%02x:%02x:%02x:%02x to Preauth failed list"),
- bssId[0], bssId[1], bssId[2], bssId[3], bssId[4], bssId[5]);
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL(" Added BSSID "MAC_ADDRESS_STR" to Preauth failed list"),
+ MAC_ADDR_ARRAY(bssId));
if ((pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress + 1) >
@@ -959,8 +959,8 @@
if (VOS_TRUE == vos_mem_compare(pNeighborRoamInfo->FTRoamInfo.preAuthFailList.macAddress[i],
bssId, sizeof(tSirMacAddr)))
{
- NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("BSSID %02x:%02x:%02x:%02x:%02x:%02x already present in preauth fail list"),
- bssId[0], bssId[1], bssId[2], bssId[3], bssId[4], bssId[5]);
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("BSSID "MAC_ADDRESS_STR" already present in preauth fail list"),
+ MAC_ADDR_ARRAY(bssId));
return eANI_BOOLEAN_FALSE;
}
}
@@ -1028,13 +1028,8 @@
status = csrRoamEnqueuePreauth(pMac, pNeighborRoamInfo->csrSessionId, pNeighborBssNode->pBssDescription,
eCsrPerformPreauth, eANI_BOOLEAN_TRUE);
- smsLog(pMac, LOG1, FL("Before Pre-Auth: BSSID %02x:%02x:%02x:%02x:%02x:%02x, Ch:%d"),
- pNeighborBssNode->pBssDescription->bssId[0],
- pNeighborBssNode->pBssDescription->bssId[1],
- pNeighborBssNode->pBssDescription->bssId[2],
- pNeighborBssNode->pBssDescription->bssId[3],
- pNeighborBssNode->pBssDescription->bssId[4],
- pNeighborBssNode->pBssDescription->bssId[5],
+ smsLog(pMac, LOG1, FL("Before Pre-Auth: BSSID "MAC_ADDRESS_STR", Ch:%d"),
+ MAC_ADDR_ARRAY(pNeighborBssNode->pBssDescription->bssId),
(int)pNeighborBssNode->pBssDescription->channelId);
if (eHAL_STATUS_SUCCESS != status)
@@ -1121,13 +1116,8 @@
{
NEIGHBOR_ROAM_DEBUG(pMac, LOG1, FL("Preauth completed successfully after %d tries"), pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries);
- smsLog(pMac, LOG1, FL("After Pre-Auth: BSSID %02x:%02x:%02x:%02x:%02x:%02x, Ch:%d"),
- pPreauthRspNode->pBssDescription->bssId[0],
- pPreauthRspNode->pBssDescription->bssId[1],
- pPreauthRspNode->pBssDescription->bssId[2],
- pPreauthRspNode->pBssDescription->bssId[3],
- pPreauthRspNode->pBssDescription->bssId[4],
- pPreauthRspNode->pBssDescription->bssId[5],
+ smsLog(pMac, LOG1, FL("After Pre-Auth: BSSID "MAC_ADDRESS_STR", Ch:%d"),
+ MAC_ADDR_ARRAY(pPreauthRspNode->pBssDescription->bssId),
(int)pPreauthRspNode->pBssDescription->channelId);
#ifdef FEATURE_WLAN_LFR_METRICS
@@ -1457,13 +1447,8 @@
while (NULL != (pScanResult = csrScanResultGetNext(pMac, *pScanResultList)))
{
VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
- FL("Scan result: BSSID %02x:%02x:%02x:%02x:%02x:%02x (Rssi %ld, Ch:%d)"),
- pScanResult->BssDescriptor.bssId[0],
- pScanResult->BssDescriptor.bssId[1],
- pScanResult->BssDescriptor.bssId[2],
- pScanResult->BssDescriptor.bssId[3],
- pScanResult->BssDescriptor.bssId[4],
- pScanResult->BssDescriptor.bssId[5],
+ FL("Scan result: BSSID "MAC_ADDRESS_STR" (Rssi %ld, Ch:%d)"),
+ MAC_ADDR_ARRAY(pScanResult->BssDescriptor.bssId),
abs(pScanResult->BssDescriptor.rssi),
pScanResult->BssDescriptor.channelId);
@@ -1582,13 +1567,8 @@
if (pScanResult->BssDescriptor.QBSSLoad_avail < pNeighborRoamInfo->MinQBssLoadRequired)
{
VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- "[INFOLOG]BSSID : %02x:%02x:%02x:%02x:%02x:%02x has no bandwidth ignoring..not adding to roam list",
- pScanResult->BssDescriptor.bssId[0],
- pScanResult->BssDescriptor.bssId[1],
- pScanResult->BssDescriptor.bssId[2],
- pScanResult->BssDescriptor.bssId[3],
- pScanResult->BssDescriptor.bssId[4],
- pScanResult->BssDescriptor.bssId[5]);
+ "[INFOLOG]BSSID : "MAC_ADDRESS_STR" has no bandwidth ignoring..not adding to roam list",
+ MAC_ADDR_ARRAY(pScanResult->BssDescriptor.bssId));
continue;
}
}
@@ -1599,13 +1579,8 @@
if (pNeighborRoamInfo->isVOAdmitted)
{
VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- "[INFOLOG]BSSID : %02x:%02x:%02x:%02x:%02x:%02x has no QBSSLoad IE, ignoring..not adding to roam list",
- pScanResult->BssDescriptor.bssId[0],
- pScanResult->BssDescriptor.bssId[1],
- pScanResult->BssDescriptor.bssId[2],
- pScanResult->BssDescriptor.bssId[3],
- pScanResult->BssDescriptor.bssId[4],
- pScanResult->BssDescriptor.bssId[5]);
+ "[INFOLOG]BSSID : "MAC_ADDRESS_STR" has no QBSSLoad IE, ignoring..not adding to roam list",
+ MAC_ADDR_ARRAY(pScanResult->BssDescriptor.bssId));
continue;
}
}
@@ -4568,13 +4543,8 @@
csrNeighborRoamGetHandoffAPInfo(pMac, &handoffNode);
VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
- FL("HANDOFF CANDIDATE BSSID %02x:%02x:%02x:%02x:%02x:%02x"),
- handoffNode.pBssDescription->bssId[0],
- handoffNode.pBssDescription->bssId[1],
- handoffNode.pBssDescription->bssId[2],
- handoffNode.pBssDescription->bssId[3],
- handoffNode.pBssDescription->bssId[4],
- handoffNode.pBssDescription->bssId[5]);
+ FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(handoffNode.pBssDescription->bssId));
#ifdef FEATURE_WLAN_LFR_METRICS
/* LFR metrics - pre-auth completion metric.
diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c
index addf028..a48e952 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -650,9 +650,8 @@
#else
smsLog( pMac, LOG1,
#endif
- "sending TDLS Del Sta %02x:%02x:%02x:%02x:%02x:%02x req to PE",
- tdlsDelStaCmdInfo->peerMac[0], tdlsDelStaCmdInfo->peerMac[1], tdlsDelStaCmdInfo->peerMac[2],
- tdlsDelStaCmdInfo->peerMac[3], tdlsDelStaCmdInfo->peerMac[4], tdlsDelStaCmdInfo->peerMac[5]);
+ "sending TDLS Del Sta "MAC_ADDRESS_STR" req to PE",
+ MAC_ADDR_ARRAY(tdlsDelStaCmdInfo->peerMac));
status = tdlsSendMessage(pMac, eWNI_SME_TDLS_DEL_STA_REQ,
(void *)tdlsDelStaReq , sizeof(tSirTdlsDelStaReq)) ;
if(!HAL_STATUS_SUCCESS( status ) )
@@ -1145,15 +1144,8 @@
{
tSirTdlsPeerInfo *peerInfo = &disRsp->tdlsDisPeerInfo[i] ;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- ("SME, peer MAC:")) ;
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- (" %02x,%02x,%02x,%02x,%02x,%02x"),
- peerInfo->peerMac[0],
- peerInfo->peerMac[1],
- peerInfo->peerMac[2],
- peerInfo->peerMac[3],
- peerInfo->peerMac[4],
- peerInfo->peerMac[5]) ;
+ ("SME, peer MAC: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(peerInfo->peerMac));
peerLinkInfo = findTdlsPeer(pMac,
&disInfo->tdlsPotentialPeerList,
@@ -1199,13 +1191,8 @@
if(eSIR_SME_SUCCESS == linkSetupRsp->statusCode)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- ("Link setup for Peer %02x,%02x,%02x,%02x,%02x,%02x"),
- linkSetupRsp->peerMac[0],
- linkSetupRsp->peerMac[1],
- linkSetupRsp->peerMac[2],
- linkSetupRsp->peerMac[3],
- linkSetupRsp->peerMac[4],
- linkSetupRsp->peerMac[5]) ;
+ ("Link setup for Peer "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(linkSetupRsp->peerMac));
tdlsUpdateTdlsPeerState(pMac, linkSetupRsp->peerMac,
TDLS_LINK_SETUP_STATE) ;
@@ -1233,13 +1220,8 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- ("Teardown peer MAC = %02x,%02x,%02x,%02x,%02x,%02x"),
- linkTearRsp->peerMac[0],
- linkTearRsp->peerMac[1],
- linkTearRsp->peerMac[2],
- linkTearRsp->peerMac[3],
- linkTearRsp->peerMac[4],
- linkTearRsp->peerMac[5]) ;
+ ("Teardown peer MAC = "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(linkTearRsp->peerMac));
tdlsDeleteTdlsPeerInfo(pMac, linkTearRsp->peerMac) ;
}
else
diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c
index aa2a67c..66c99f3 100644
--- a/CORE/SME/src/rrm/sme_rrm.c
+++ b/CORE/SME/src/rrm/sme_rrm.c
@@ -250,13 +250,8 @@
vos_mem_copy( &pBeaconRep->pBssDescription[msgCounter]->ieFields[0],
pBssDesc->ieFields, ie_len );
smsLog( pMac, LOG1,
- "...RRM Result Bssid = %02x-%02x-%02x-%02x-%02x-%02x chan= %d, rssi = -%d",
- pBeaconRep->pBssDescription[msgCounter]->bssId[ 0 ],
- pBeaconRep->pBssDescription[msgCounter]->bssId[ 1 ],
- pBeaconRep->pBssDescription[msgCounter]->bssId[ 2 ],
- pBeaconRep->pBssDescription[msgCounter]->bssId[ 3 ],
- pBeaconRep->pBssDescription[msgCounter]->bssId[ 4 ],
- pBeaconRep->pBssDescription[msgCounter]->bssId[ 5 ],
+ "...RRM Result Bssid = "MAC_ADDRESS_STR" chan= %d, rssi = -%d",
+ MAC_ADDR_ARRAY(pBeaconRep->pBssDescription[msgCounter]->bssId),
pBeaconRep->pBssDescription[msgCounter]->channelId,
pBeaconRep->pBssDescription[msgCounter]->rssi * (-1));
@@ -978,13 +973,8 @@
sizeof(tSirNeighborBssDescription));
#if defined WLAN_VOWIFI_DEBUG
- smsLog( pMac, LOGE, "Received neighbor report with Neighbor BSSID: %02x:%02x:%02x:%02x:%02x:%02x ",
- pNeighborRpt->sNeighborBssDescription[i].bssId[0],
- pNeighborRpt->sNeighborBssDescription[i].bssId[1],
- pNeighborRpt->sNeighborBssDescription[i].bssId[2],
- pNeighborRpt->sNeighborBssDescription[i].bssId[3],
- pNeighborRpt->sNeighborBssDescription[i].bssId[4],
- pNeighborRpt->sNeighborBssDescription[i].bssId[5]);
+ smsLog( pMac, LOGE, "Received neighbor report with Neighbor BSSID: "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pNeighborRpt->sNeighborBssDescription[i].bssId));
#endif
/* Calculate the roam score based on the BSS Capability in the BSSID Information and store it in Neighbor report Desc */
@@ -997,13 +987,8 @@
}
else
{
- smsLog(pMac, LOGE, FL("Roam score of BSSID %02x:%02x:%02x:%02x:%02x:%02x is 0, Ignoring.."),
- pNeighborRpt->sNeighborBssDescription[i].bssId[0],
- pNeighborRpt->sNeighborBssDescription[i].bssId[1],
- pNeighborRpt->sNeighborBssDescription[i].bssId[2],
- pNeighborRpt->sNeighborBssDescription[i].bssId[3],
- pNeighborRpt->sNeighborBssDescription[i].bssId[4],
- pNeighborRpt->sNeighborBssDescription[i].bssId[5]);
+ smsLog(pMac, LOGE, FL("Roam score of BSSID "MAC_ADDRESS_STR" is 0, Ignoring.."),
+ MAC_ADDR_ARRAY(pNeighborRpt->sNeighborBssDescription[i].bssId));
vos_mem_free(pNeighborReportDesc->pNeighborBssDescription);
vos_mem_free(pNeighborReportDesc);