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) &&