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/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 7c8e013..4c0c68d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3010,48 +3010,25 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [AutoBmpsTimerEnabled] Value = [%u]",pHddCtx->cfg_ini->fIsAutoBmpsTimerEnabled);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [nAutoBmpsTimerValue] Value = [%u]",pHddCtx->cfg_ini->nAutoBmpsTimerValue);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [nVccRssiTrigger] Value = [%u]",pHddCtx->cfg_ini->nVccRssiTrigger);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssBssid] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
- pHddCtx->cfg_ini->IbssBssid.bytes[0],pHddCtx->cfg_ini->IbssBssid.bytes[1],
- pHddCtx->cfg_ini->IbssBssid.bytes[2],pHddCtx->cfg_ini->IbssBssid.bytes[3],
- pHddCtx->cfg_ini->IbssBssid.bytes[4],pHddCtx->cfg_ini->IbssBssid.bytes[5]);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Name = [gIbssBssid] Value =["MAC_ADDRESS_STR"]",
+ MAC_ADDR_ARRAY(pHddCtx->cfg_ini->IbssBssid.bytes));
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
- "Name = [Intf0MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
- pHddCtx->cfg_ini->intfMacAddr[0].bytes[0],
- pHddCtx->cfg_ini->intfMacAddr[0].bytes[1],
- pHddCtx->cfg_ini->intfMacAddr[0].bytes[2],
- pHddCtx->cfg_ini->intfMacAddr[0].bytes[3],
- pHddCtx->cfg_ini->intfMacAddr[0].bytes[4],
- pHddCtx->cfg_ini->intfMacAddr[0].bytes[5]);
-
+ "Name = [Intf0MacAddress] Value =["MAC_ADDRESS_STR"]",
+ MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[0].bytes));
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
- "Name = [Intf1MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
- pHddCtx->cfg_ini->intfMacAddr[1].bytes[0],
- pHddCtx->cfg_ini->intfMacAddr[1].bytes[1],
- pHddCtx->cfg_ini->intfMacAddr[1].bytes[2],
- pHddCtx->cfg_ini->intfMacAddr[1].bytes[3],
- pHddCtx->cfg_ini->intfMacAddr[1].bytes[4],
- pHddCtx->cfg_ini->intfMacAddr[1].bytes[5]);
+ "Name = [Intf1MacAddress] Value =["MAC_ADDRESS_STR"]",
+ MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[1].bytes));
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
- "Name = [Intf2MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
- pHddCtx->cfg_ini->intfMacAddr[2].bytes[0],
- pHddCtx->cfg_ini->intfMacAddr[2].bytes[1],
- pHddCtx->cfg_ini->intfMacAddr[2].bytes[2],
- pHddCtx->cfg_ini->intfMacAddr[2].bytes[3],
- pHddCtx->cfg_ini->intfMacAddr[2].bytes[4],
- pHddCtx->cfg_ini->intfMacAddr[2].bytes[5]);
+ "Name = [Intf2MacAddress] Value =["MAC_ADDRESS_STR"]",
+ MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[2].bytes));
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
- "Name = [Intf3MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
- pHddCtx->cfg_ini->intfMacAddr[3].bytes[0],
- pHddCtx->cfg_ini->intfMacAddr[3].bytes[1],
- pHddCtx->cfg_ini->intfMacAddr[3].bytes[2],
- pHddCtx->cfg_ini->intfMacAddr[3].bytes[3],
- pHddCtx->cfg_ini->intfMacAddr[3].bytes[4],
- pHddCtx->cfg_ini->intfMacAddr[3].bytes[5]);
-
+ "Name = [Intf3MacAddress] Value =["MAC_ADDRESS_STR"]",
+ MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[3].bytes));
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApEnableUapsd] value = [%u]\n",pHddCtx->cfg_ini->apUapsdEnabled);
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index c2f5ec6..fbf933f 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4364,9 +4364,7 @@
hddPrintMacAddr(tCsrBssid macAddr, tANI_U8 logLevel)
{
VOS_TRACE(VOS_MODULE_ID_HDD, logLevel,
- "%02X:%02X:%02X:%02X:%02X:%02X\n",
- macAddr[0], macAddr[1], macAddr[2], macAddr[3], macAddr[4],
- macAddr[5]);
+ MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr));
} /****** end hddPrintMacAddr() ******/
void
@@ -8517,8 +8515,9 @@
int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy,
struct net_device *dev, u8 *peer)
{
- hddLog(VOS_TRACE_LEVEL_INFO, "tdls send discover req: %x %x %x %x %x %x",
- peer[0], peer[1], peer[2], peer[3], peer[4], peer[5]);
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ "tdls send discover req: "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(peer));
return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer,
WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, NULL, 0);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 806940c..af90047 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1207,13 +1207,11 @@
pBatchScanRsp->timestamp - pApMetaInfo->timestamp;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
- "%s: bssId 0x%x:0x%x:0x%x:0x%x:0x%x:0x%x "
- "ch %d rssi %d timestamp %d", __func__,
- pApMetaInfo->bssid[0],pApMetaInfo->bssid[1],
- pApMetaInfo->bssid[2],pApMetaInfo->bssid[3],
- pApMetaInfo->bssid[4],pApMetaInfo->bssid[5],
- pApMetaInfo->ch, pApMetaInfo->rssi,
- pApMetaInfo->timestamp);
+ "%s: bssId "MAC_ADDRESS_STR
+ " ch %d rssi %d timestamp %d", __func__,
+ MAC_ADDR_ARRAY(pApMetaInfo->bssid),
+ pApMetaInfo->ch, pApMetaInfo->rssi,
+ pApMetaInfo->timestamp);
/*mark last AP in batch scan response*/
if ((TRUE == pBatchScanRsp->isLastResult) &&
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index 0cf5b17..bf34d81 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -1282,10 +1282,7 @@
pAddBssParams->extSetStaKeyParam.staIdx = 0;
PELOG1(limLog(pMac, LOG1,
- FL("BSSID = %02X-%02X-%02X-%02X-%02X-%02X"),
- pKeyInfo->bssId[0], pKeyInfo->bssId[1],
- pKeyInfo->bssId[2], pKeyInfo->bssId[3],
- pKeyInfo->bssId[4], pKeyInfo->bssId[5]);)
+ FL("BSSID = "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pKeyInfo->bssId));)
if(pAddBssParams->extSetStaKeyParam.key[0].keyLength == 16)
{
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index ace5106..99f2dbc 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1759,15 +1759,8 @@
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
("TDLS setup rsp timer expires ")) ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("TDLS setup rsp timer expires for peer:")) ;
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("%02X, %02X, %02X,%02X, %02X, %02X"),
- peerMac[0],
- peerMac[1],
- peerMac[2],
- peerMac[3],
- peerMac[4],
- peerMac[5]);
+ ("TDLS setup rsp timer expires for peer:"
+ MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac));
limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ;
if(NULL != setupPeer)
@@ -1787,15 +1780,8 @@
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
("TDLS setup CNF timer expires ")) ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("TDLS setup CNF timer expires for peer:")) ;
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("%02X, %02X, %02X,%02X, %02X, %02X"),
- peerMac[0],
- peerMac[1],
- peerMac[2],
- peerMac[3],
- peerMac[4],
- peerMac[5]);
+ ("TDLS setup CNF timer expires for peer: "
+ MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac));
limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ;
if(NULL != setupPeer)
{
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 234de3a..66fd790 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -4338,9 +4338,8 @@
//To remove the preauth node in case of fail to associate
if (limSearchPreAuthList(pMac, psessionEntry->bssId))
{
- PELOG1(limLog(pMac, LOG1, FL(" delete pre auth node for %02X-%02X-%02X-%02X-%02X-%02X"),
- psessionEntry->bssId[0], psessionEntry->bssId[1], psessionEntry->bssId[2],
- psessionEntry->bssId[3], psessionEntry->bssId[4], psessionEntry->bssId[5]);)
+ PELOG1(limLog(pMac, LOG1, FL(" delete pre auth node for "
+ MAC_ADDRESS_STR), MAC_ADDR_ARRAY(psessionEntry->bssId));)
limDeletePreAuthNode(pMac, psessionEntry->bssId);
}
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 9bcc101..527bd2f 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -1910,14 +1910,9 @@
psessionEntry->ssId.ssId[3],
psessionEntry->ssId.ssId[4],
psessionEntry->ssId.ssId[5]);
- limLog(pMac, LOG1, FL("Channel %d, BSSID %x:%x:%x:%x:%x:%x"),
+ limLog(pMac, LOG1, FL("Channel %d, BSSID "MAC_ADDRESS_STR),
psessionEntry->currentOperChannel,
- psessionEntry->bssId[0],
- psessionEntry->bssId[1],
- psessionEntry->bssId[2],
- psessionEntry->bssId[3],
- psessionEntry->bssId[4],
- psessionEntry->bssId[5]);)
+ MAC_ADDR_ARRAY(psessionEntry->bssId));)
/* Indicate whether spectrum management is enabled*/
psessionEntry->spectrumMgtEnabled =
@@ -3900,9 +3895,9 @@
return;
}
- PELOG1(limLog(pMac, LOG1, FL("Sent DELTS request to station with assocId = %d MacAddr = %x:%x:%x:%x:%x:%x"),
- pDeltsReq->aid, peerMacAddr[0], peerMacAddr[1], peerMacAddr[2],
- peerMacAddr[3], peerMacAddr[4], peerMacAddr[5]);)
+ PELOG1(limLog(pMac, LOG1, FL("Sent DELTS request to station with "
+ "assocId = %d MacAddr = "MAC_ADDRESS_STR),
+ pDeltsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));)
limSendDeltsReqActionFrame(pMac, peerMacAddr, pDeltsReq->req.wmeTspecPresent, &pDeltsReq->req.tsinfo, &pDeltsReq->req.tspec,
psessionEntry);
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index ae17a02..7a32215 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -4208,8 +4208,9 @@
limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ;
if(NULL == setupPeer) {
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("limTdlsLinkEstablish: cannot find peer mac in tdls linksetup list: "MAC_ADDRESS_STR),
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("limTdlsLinkEstablish: cannot find peer mac "
+ "in tdls linksetup list: "MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(peerMac));
return eSIR_FAILURE;
}
@@ -4228,10 +4229,10 @@
/* */
pStaDs = dphLookupHashEntry(pMac, peerMac, &aid, &psessionEntry->dph.dphHashTable) ;
if(pStaDs == NULL) {
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("limTdlsLinkEstablish: cannot find peer mac in hash table: %02X %02X %02X %02X %02X %02X"),
- peerMac[0], peerMac[1], peerMac[2],
- peerMac[3], peerMac[4], peerMac[5]);
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("limTdlsLinkEstablish: cannot find peer mac "
+ "in tdls linksetup list: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(peerMac));
return eSIR_FAILURE;
}
@@ -4336,10 +4337,10 @@
limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ;
if(NULL == setupPeer) {
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("limTdlsLinkTeardown: cannot find peer mac in tdls linksetup list: %02X %02X %02X %02X %02X %02X"),
- peerMac[0], peerMac[1], peerMac[2],
- peerMac[3], peerMac[4], peerMac[5]);
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("limTdlsLinkTeardown: cannot find peer mac "
+ "in tdls linksetup list: "
+ MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac));
return eSIR_FAILURE;
}
@@ -4359,10 +4360,10 @@
pStaDs = dphLookupHashEntry(pMac, peerMac, &aid, &psessionEntry->dph.dphHashTable);
if(pStaDs == NULL) {
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("limTdlsLinkTeardown: cannot find peer mac in hash table: %02X %02X %02X %02X %02X %02X"),
- peerMac[0], peerMac[1], peerMac[2],
- peerMac[3], peerMac[4], peerMac[5]);
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
+ ("limTdlsLinkTeardown: cannot find peer mac "
+ "in hash table: "
+ MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac));
return eSIR_FAILURE;
}
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index a1aa4c0..7ba3332 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -1273,9 +1273,7 @@
limPrintMacAddr(tpAniSirGlobal pMac, tSirMacAddr macAddr, tANI_U8 logLevel)
{
limLog(pMac, logLevel,
- FL("%X:%X:%X:%X:%X:%X"),
- macAddr[0], macAddr[1], macAddr[2], macAddr[3], macAddr[4],
- macAddr[5]);
+ FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(macAddr));
} /****** end limPrintMacAddr() ******/
@@ -5816,9 +5814,9 @@
PELOGE(limLog(pMac, LOGE, FL("limValidateDeltsReq failed"));)
goto error2;
}
- PELOG1(limLog(pMac, LOG1, "Sent DELTS request to station with assocId = %d MacAddr = %x:%x:%x:%x:%x:%x",
- pDelTsReq->aid, peerMacAddr[0], peerMacAddr[1], peerMacAddr[2],
- peerMacAddr[3], peerMacAddr[4], peerMacAddr[5]);)
+ PELOG1(limLog(pMac, LOG1, "Sent DELTS request to station with "
+ "assocId = %d MacAddr = "MAC_ADDRESS_STR,
+ pDelTsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));)
limSendDeltsReqActionFrame(pMac, peerMacAddr, pDelTsReq->req.wmeTspecPresent, &pDelTsReq->req.tsinfo, &pDelTsReq->req.tspec,
psessionEntry);
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index 6c929e5..6df086f 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -464,24 +464,19 @@
vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_ASSOC_IND, (v_PVOID_t)eSAP_STATUS_SUCCESS);
if(!VOS_IS_STATUS_SUCCESS(vosStatus))
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "In %s, CSR roamResult = (%d) MAC"
- "(%02X-%02X-%02X-%02X-%02X-%02X) fail",
- __func__, roamResult, pCsrRoamInfo->peerMac[0],
- pCsrRoamInfo->peerMac[1], pCsrRoamInfo->peerMac[2],
- pCsrRoamInfo->peerMac[3], pCsrRoamInfo->peerMac[4],
- pCsrRoamInfo->peerMac[5]);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ "In %s, CSR roamResult = (%d) MAC ("
+ MAC_ADDRESS_STR") fail", __func__, roamResult,
+ MAC_ADDR_ARRAY(pCsrRoamInfo->peerMac));
halStatus = eHAL_STATUS_FAILURE;
}
}
else
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
- "In %s, CSR roamResult = (%d) MAC"
- "(%02X-%02X-%02X-%02X-%02X-%02X) not allowed",
- __func__, roamResult, pCsrRoamInfo->peerMac[0],
- pCsrRoamInfo->peerMac[1], pCsrRoamInfo->peerMac[2],
- pCsrRoamInfo->peerMac[3], pCsrRoamInfo->peerMac[4], pCsrRoamInfo->peerMac[5]);
+ VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
+ "In %s, CSR roamResult = (%d) MAC ("
+ MAC_ADDRESS_STR") not allowed", __func__, roamResult,
+ MAC_ADDR_ARRAY(pCsrRoamInfo->peerMac));
halStatus = eHAL_STATUS_FAILURE;
}
diff --git a/CORE/SME/src/btc/btcApi.c b/CORE/SME/src/btc/btcApi.c
index d2dfc45..43b88fa 100644
--- a/CORE/SME/src/btc/btcApi.c
+++ b/CORE/SME/src/btc/btcApi.c
@@ -952,13 +952,10 @@
}
else
{
- smsLog( pMac, LOGE, FL(" cannot find match for failed BT_EVENT_ACL_CONNECTION_COMPLETE of bdAddr (%02X-%02X-%02X-%02X-%02X-%02X)"),
- pEvent->uEventParam.btAclConnection.bdAddr[0],
- pEvent->uEventParam.btAclConnection.bdAddr[1],
- pEvent->uEventParam.btAclConnection.bdAddr[2],
- pEvent->uEventParam.btAclConnection.bdAddr[3],
- pEvent->uEventParam.btAclConnection.bdAddr[4],
- pEvent->uEventParam.btAclConnection.bdAddr[5]);
+ smsLog(pMac, LOGE, FL(" cannot find match for failed "
+ "BT_EVENT_ACL_CONNECTION_COMPLETE of bdAddr "
+ MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pEvent->uEventParam.btAclConnection.bdAddr));
status = VOS_STATUS_E_EMPTY;
}
}while(0);
@@ -1120,13 +1117,10 @@
}
else
{
- smsLog( pMac, LOGE, FL(" cannot find match for BT_EVENT_SYNC_CONNECTION_COMPLETE of bdAddr (%02X-%02X-%02X-%02X-%02X-%02X)"),
- pEvent->uEventParam.btSyncConnection.bdAddr[0],
- pEvent->uEventParam.btSyncConnection.bdAddr[1],
- pEvent->uEventParam.btSyncConnection.bdAddr[2],
- pEvent->uEventParam.btSyncConnection.bdAddr[3],
- pEvent->uEventParam.btSyncConnection.bdAddr[4],
- pEvent->uEventParam.btSyncConnection.bdAddr[5]);
+ smsLog(pMac, LOGE, FL(" cannot find match for "
+ "BT_EVENT_SYNC_CONNECTION_COMPLETE of bdAddr "
+ MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pEvent->uEventParam.btSyncConnection.bdAddr));
status = VOS_STATUS_E_EMPTY;
}
}while(0);
@@ -1678,6 +1672,7 @@
---------------------------------------------------------------------------*/
static void btcLogEvent (tHalHandle hHal, tpSmeBtEvent pBtEvent)
{
+ v_U8_t bdAddrRev[6];
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: "
"Bluetooth Event %d received", __func__, pBtEvent->btEventType);
switch(pBtEvent->btEventType)
@@ -1694,14 +1689,16 @@
pBtEvent->uEventParam.btSyncConnection.scoInterval,
pBtEvent->uEventParam.btSyncConnection.scoWindow,
pBtEvent->uEventParam.btSyncConnection.retransmisisonWindow);
+
+ bdAddrRev[0] = pBtEvent->uEventParam.btSyncConnection.bdAddr[5];
+ bdAddrRev[1] = pBtEvent->uEventParam.btSyncConnection.bdAddr[4];
+ bdAddrRev[2] = pBtEvent->uEventParam.btSyncConnection.bdAddr[3];
+ bdAddrRev[3] = pBtEvent->uEventParam.btSyncConnection.bdAddr[2];
+ bdAddrRev[4] = pBtEvent->uEventParam.btSyncConnection.bdAddr[1];
+ bdAddrRev[5] = pBtEvent->uEventParam.btSyncConnection.bdAddr[0];
+
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "BD ADDR = "
- "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
- pBtEvent->uEventParam.btSyncConnection.bdAddr[5],
- pBtEvent->uEventParam.btSyncConnection.bdAddr[4],
- pBtEvent->uEventParam.btSyncConnection.bdAddr[3],
- pBtEvent->uEventParam.btSyncConnection.bdAddr[2],
- pBtEvent->uEventParam.btSyncConnection.bdAddr[1],
- pBtEvent->uEventParam.btSyncConnection.bdAddr[0]);
+ MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bdAddrRev));
break;
case BT_EVENT_CREATE_ACL_CONNECTION:
case BT_EVENT_ACL_CONNECTION_COMPLETE:
@@ -1709,14 +1706,16 @@
"connectionHandle = %d status = %d ",
pBtEvent->uEventParam.btAclConnection.connectionHandle,
pBtEvent->uEventParam.btAclConnection.status);
+
+ bdAddrRev[0] = pBtEvent->uEventParam.btAclConnection.bdAddr[5];
+ bdAddrRev[1] = pBtEvent->uEventParam.btAclConnection.bdAddr[4];
+ bdAddrRev[2] = pBtEvent->uEventParam.btAclConnection.bdAddr[3];
+ bdAddrRev[3] = pBtEvent->uEventParam.btAclConnection.bdAddr[2];
+ bdAddrRev[4] = pBtEvent->uEventParam.btAclConnection.bdAddr[1];
+ bdAddrRev[5] = pBtEvent->uEventParam.btAclConnection.bdAddr[0];
+
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "BD ADDR = "
- "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
- pBtEvent->uEventParam.btAclConnection.bdAddr[5],
- pBtEvent->uEventParam.btAclConnection.bdAddr[4],
- pBtEvent->uEventParam.btAclConnection.bdAddr[3],
- pBtEvent->uEventParam.btAclConnection.bdAddr[2],
- pBtEvent->uEventParam.btAclConnection.bdAddr[1],
- pBtEvent->uEventParam.btAclConnection.bdAddr[0]);
+ MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bdAddrRev));
break;
case BT_EVENT_MODE_CHANGED:
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "ACL Mode change : "
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
diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c
index 3f25ce7..e8a159b 100644
--- a/CORE/SME/src/rrm/sme_rrm.c
+++ b/CORE/SME/src/rrm/sme_rrm.c
@@ -390,9 +390,8 @@
&(pBcnReport->bcnRepBssInfo[msgCounter].pBuf), &outIeLen);
pBcnReport->bcnRepBssInfo[msgCounter].ieLen = outIeLen;
- smsLog( pMac, LOG1,"Bssid(%02X:%02X:%02X:%02X:%02X:%02X) Channel=%d Rssi=%d",
- pBssDesc->bssId[0], pBssDesc->bssId[1], pBssDesc->bssId[2],
- pBssDesc->bssId[3], pBssDesc->bssId[4], pBssDesc->bssId[5],
+ smsLog( pMac, LOG1,"Bssid("MAC_ADDRESS_STR") Channel=%d Rssi=%d",
+ MAC_ADDR_ARRAY(pBssDesc->bssId),
pBssDesc->channelId, (-1) * pBssDesc->rssi);
pBcnReport->numBss++;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index f47a7f1..804528f 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -6105,10 +6105,8 @@
pNeighborRoamInfo->cfgRoamEn = eSME_ROAM_TRIGGER_SCAN;
vos_mem_copy((void *)(&pNeighborRoamInfo->cfgRoambssId),
(void *)bssid, sizeof(tSirMacAddr));
- smsLog(pMac, LOG1, "Calling Roam Look Up down Event BSSID %x %x %x %x %x %x",
- pNeighborRoamInfo->cfgRoambssId[0], pNeighborRoamInfo->cfgRoambssId[1],
- pNeighborRoamInfo->cfgRoambssId[2], pNeighborRoamInfo->cfgRoambssId[3],
- pNeighborRoamInfo->cfgRoambssId[4], pNeighborRoamInfo->cfgRoambssId[5]);
+ smsLog(pMac, LOG1, "Calling Roam Look Up down Event BSSID "
+ MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pNeighborRoamInfo->cfgRoambssId));
vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac);
if (VOS_STATUS_SUCCESS != vosStatus)
@@ -6123,10 +6121,8 @@
vos_mem_copy((void *)(&pNeighborRoamInfo->cfgRoambssId),
(void *)bssid, sizeof(tSirMacAddr));
pNeighborRoamInfo->cfgRoamEn = eSME_ROAM_TRIGGER_FAST_ROAM;
- smsLog(pMac, LOG1, "Roam to BSSID %x-%x-%x-%x-%x-%x",
- pNeighborRoamInfo->cfgRoambssId[0], pNeighborRoamInfo->cfgRoambssId[1],
- pNeighborRoamInfo->cfgRoambssId[2], pNeighborRoamInfo->cfgRoambssId[3],
- pNeighborRoamInfo->cfgRoambssId[4], pNeighborRoamInfo->cfgRoambssId[5]);
+ smsLog(pMac, LOG1, "Roam to BSSID "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pNeighborRoamInfo->cfgRoambssId));
vosStatus = csrNeighborRoamReassocIndCallback(pMac->roam.gVosContext,
0,
diff --git a/CORE/SME/src/sme_common/sme_FTApi.c b/CORE/SME/src/sme_common/sme_FTApi.c
index 478d452..0f0a861 100644
--- a/CORE/SME/src/sme_common/sme_FTApi.c
+++ b/CORE/SME/src/sme_common/sme_FTApi.c
@@ -345,9 +345,8 @@
&pFTKeyInfo->peerMac[ 0 ],
sizeof(tCsrBssid) );
- smsLog(pMac, LOG1, "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, "BSSID = "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pMsg->bssId));
status = palSendMBMessage(pMac->hHdd, pMsg);
diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index cdfc016..18cd66e 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -7817,9 +7817,9 @@
return vosStatus;
}
- TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW,"station mac 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
- pDestMacAddress->bytes[0], pDestMacAddress->bytes[1], pDestMacAddress->bytes[2],
- pDestMacAddress->bytes[3], pDestMacAddress->bytes[4], pDestMacAddress->bytes[5]));
+ TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW,
+ "station mac "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pDestMacAddress->bytes)));
if (vos_is_macaddr_broadcast( pDestMacAddress ) || vos_is_macaddr_group(pDestMacAddress))
{
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 7063b8d..f22f43c 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -1170,9 +1170,9 @@
//This part of the code can be removed when NV is programmed
const v_U8_t macAddr[VOS_MAC_ADDRESS_LEN] = VOS_HARD_CODED_MAC;
memcpy( pMacAddress, macAddr, VOS_MAC_ADDRESS_LEN );
- VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
- " fail to get MAC address from NV, hardcoded to %02X-%02X-%02X-%02X-%02X%02X",
- macAddr[0], macAddr[1], macAddr[2], macAddr[3], macAddr[4], macAddr[5]);
+ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN,
+ "fail to get MAC address from NV, hardcoded to "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(macAddr));
status = VOS_STATUS_SUCCESS;
}
return status;