wlan: MAC Address Logging Fix.
Use pre-defined macro's to log MAC addresses.
Change-Id: Ia48be0eb3f4efe0f4f66752b852fe84bbe2e3344
CRs-Fixed: 573100
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 8c4fba5..0a0e2b2 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -645,13 +645,8 @@
}
}
#endif
- pr_info("wlan: connected to %02x:%02x:%02x:%02x:%02x:%02x\n",
- wrqu.ap_addr.sa_data[0],
- wrqu.ap_addr.sa_data[1],
- wrqu.ap_addr.sa_data[2],
- wrqu.ap_addr.sa_data[3],
- wrqu.ap_addr.sa_data[4],
- wrqu.ap_addr.sa_data[5]);
+ pr_info("wlan: connected to " MAC_ADDRESS_STR"\n",
+ MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data));
hdd_SendUpdateBeaconIEsEvent(pAdapter, pCsrRoamInfo);
/* Send IWEVASSOCRESPIE Event if WLAN_FEATURE_CIQ_METRICS is Enabled Or
@@ -675,13 +670,8 @@
{
memcpy(wrqu.ap_addr.sa_data, pHddStaCtx->conn_info.bssId, ETH_ALEN);
type = WLAN_STA_ASSOC_DONE_IND;
- pr_info("wlan: new IBSS connection to %02x:%02x:%02x:%02x:%02x:%02x",
- pHddStaCtx->conn_info.bssId[0],
- pHddStaCtx->conn_info.bssId[1],
- pHddStaCtx->conn_info.bssId[2],
- pHddStaCtx->conn_info.bssId[3],
- pHddStaCtx->conn_info.bssId[4],
- pHddStaCtx->conn_info.bssId[5]);
+ pr_info("wlan: new IBSS connection to " MAC_ADDRESS_STR"\n",
+ MAC_ADDR_ARRAY(pHddStaCtx->conn_info.bssId));
}
else /* Not Associated */
{
@@ -1429,17 +1419,15 @@
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
if (pRoamInfo)
- pr_info("wlan: connection failed with %02x:%02x:%02x:%02x:%02x:%02x"
- " reason:%d and Status:%d\n", pRoamInfo->bssid[0],
- pRoamInfo->bssid[1], pRoamInfo->bssid[2],
- pRoamInfo->bssid[3], pRoamInfo->bssid[4],
- pRoamInfo->bssid[5], roamResult, roamStatus);
+ pr_info("wlan: connection failed with " MAC_ADDRESS_STR
+ " reason:%d and Status:%d\n",
+ MAC_ADDR_ARRAY(pRoamInfo->bssid),
+ roamResult, roamStatus);
else
- pr_info("wlan: connection failed with %02x:%02x:%02x:%02x:%02x:%02x"
- " reason:%d and Status:%d\n", pWextState->req_bssId[0],
- pWextState->req_bssId[1], pWextState->req_bssId[2],
- pWextState->req_bssId[3], pWextState->req_bssId[4],
- pWextState->req_bssId[5], roamResult, roamStatus);
+ pr_info("wlan: connection failed with " MAC_ADDRESS_STR
+ " reason:%d and Status:%d\n",
+ MAC_ADDR_ARRAY(pWextState->req_bssId),
+ roamResult, roamStatus);
/*Handle all failure conditions*/
hdd_connSetConnectionState( pHddStaCtx, eConnectionState_NotConnected);
@@ -1875,13 +1863,8 @@
memset(&msg, '\0', sizeof(msg));
msg.src_addr.sa_family = ARPHRD_ETHER;
memcpy(msg.src_addr.sa_data, pRoamInfo->u.pMICFailureInfo->taMacAddr, sizeof(pRoamInfo->u.pMICFailureInfo->taMacAddr));
- hddLog(LOG1, "MIC MAC %02x:%02x:%02x:%02x:%02x:%02x",
- msg.src_addr.sa_data[0],
- msg.src_addr.sa_data[1],
- msg.src_addr.sa_data[2],
- msg.src_addr.sa_data[3],
- msg.src_addr.sa_data[4],
- msg.src_addr.sa_data[5]);
+ hddLog(LOG1, "MIC MAC " MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(msg.src_addr.sa_data));
if(pRoamInfo->u.pMICFailureInfo->multicast == eSIR_TRUE)
msg.flags = IW_MICFAILURE_GROUP;
@@ -2182,21 +2165,20 @@
#ifdef WLAN_FEATURE_TDLS_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- ("hdd_tdlsStatusUpdate: %s staIdx %d %02x:%02x:%02x:%02x:%02x:%02x \n"),
- roamResult == eCSR_ROAM_RESULT_ADD_TDLS_PEER ? "ADD_TDLS_PEER" :
- roamResult == eCSR_ROAM_RESULT_DELETE_TDLS_PEER ? "DEL_TDLS_PEER" :
- roamResult == eCSR_ROAM_RESULT_TEARDOWN_TDLS_PEER_IND ? "DEL_TDLS_PEER_IND" :
- roamResult == eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND? "DEL_ALL_TDLS_PEER_IND" :
- roamResult == eCSR_ROAM_RESULT_UPDATE_TDLS_PEER? "UPDATE_TDLS_PEER" :
- roamResult == eCSR_ROAM_RESULT_LINK_ESTABLISH_REQ_RSP? "LINK_ESTABLISH_REQ_RSP" :
- "UNKNOWN",
- pRoamInfo->staId,
- pRoamInfo->peerMac[0],
- pRoamInfo->peerMac[1],
- pRoamInfo->peerMac[2],
- pRoamInfo->peerMac[3],
- pRoamInfo->peerMac[4],
- pRoamInfo->peerMac[5]) ;
+ ("hdd_tdlsStatusUpdate: %s staIdx %d " MAC_ADDRESS_STR),
+ roamResult == eCSR_ROAM_RESULT_ADD_TDLS_PEER ?
+ "ADD_TDLS_PEER" :
+ roamResult == eCSR_ROAM_RESULT_DELETE_TDLS_PEER ?
+ "DEL_TDLS_PEER" :
+ roamResult == eCSR_ROAM_RESULT_TEARDOWN_TDLS_PEER_IND ?
+ "DEL_TDLS_PEER_IND" :
+ roamResult == eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND ?
+ "DEL_ALL_TDLS_PEER_IND" :
+ roamResult == eCSR_ROAM_RESULT_UPDATE_TDLS_PEER ?
+ "UPDATE_TDLS_PEER" :
+ roamResult == eCSR_ROAM_RESULT_LINK_ESTABLISH_REQ_RSP ?
+ "LINK_ESTABLISH_REQ_RSP" : "UNKNOWN",
+ pRoamInfo->staId, MAC_ADDR_ARRAY(pRoamInfo->peerMac));
#endif
switch( roamResult )
{
@@ -2219,15 +2201,10 @@
pHddCtx->tdlsConnInfo[staIdx].staId = pRoamInfo->staId;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- ("TDLS: STA IDX at %d is %d "
- "of mac %02x:%02x:%02x:%02x:%02x:%02x"),
+ ("TDLS: STA IDX at %d is %d "
+ "of mac " MAC_ADDRESS_STR),
staIdx, pHddCtx->tdlsConnInfo[staIdx].staId,
- pRoamInfo->peerMac[0],
- pRoamInfo->peerMac[1],
- pRoamInfo->peerMac[2],
- pRoamInfo->peerMac[3],
- pRoamInfo->peerMac[4],
- pRoamInfo->peerMac[5]) ;
+ MAC_ADDR_ARRAY(pRoamInfo->peerMac));
vos_copy_macaddr(&pHddCtx->tdlsConnInfo[staIdx].peerMac,
(v_MACADDR_t *)pRoamInfo->peerMac) ;
@@ -2343,14 +2320,9 @@
pHddCtx->tdlsConnInfo[staIdx].staId)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- ("hdd_tdlsStatusUpdate: staIdx %d %02x:%02x:%02x:%02x:%02x:%02x"),
+ ("hdd_tdlsStatusUpdate: staIdx %d " MAC_ADDRESS_STR),
pHddCtx->tdlsConnInfo[staIdx].staId,
- pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[0],
- pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[1],
- pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[2],
- pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[3],
- pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[4],
- pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[5]) ;
+ MAC_ADDR_ARRAY(pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes));
wlan_hdd_tdls_reset_peer(pAdapter, pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes);
hdd_roamDeregisterTDLSSTA ( pAdapter, pHddCtx->tdlsConnInfo[staIdx].staId );
wlan_hdd_tdls_decrement_peer_count(pAdapter);
@@ -3778,8 +3750,8 @@
v_U8_t *pMacAddress=NULL;
ENTER();
pMacAddress = (v_U8_t*) wrqu->ap_addr.sa_data;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%02x:%02x:%02x:%02x:%02x:%02x",pMacAddress[0],pMacAddress[1],
- pMacAddress[2],pMacAddress[3],pMacAddress[4],pMacAddress[5]);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s "MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(pMacAddress));
vos_mem_copy( pHddStaCtx->conn_info.bssId, pMacAddress, sizeof( tCsrBssid ));
EXIT();
@@ -3934,10 +3906,9 @@
memset(buf, '\0', sizeof(buf));
/* Timestamp0 is lower 32 bits and Timestamp1 is upper 32 bits */
- hddLog(VOS_TRACE_LEVEL_INFO, "CCXPREAUTHNOTIFY=%02x:%02x:%02x:%02x:%02x:%02x %lu:%lu",
- pRoamInfo->bssid[0], pRoamInfo->bssid[1], pRoamInfo->bssid[2],
- pRoamInfo->bssid[3], pRoamInfo->bssid[4], pRoamInfo->bssid[5],
- pRoamInfo->timestamp[0], pRoamInfo->timestamp[1]);
+ hddLog(VOS_TRACE_LEVEL_ERROR, "CCXPREAUTHNOTIFY=" MAC_ADDRESS_STR " %lu:%lu",
+ MAC_ADDR_ARRAY(pRoamInfo->bssid),
+ pRoamInfo->timestamp[0], pRoamInfo->timestamp[1]);
nBytes = snprintf(pos, freeBytes, "CCXPREAUTHNOTIFY=");
pos += nBytes;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index a3fa8de..4dedebb 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3869,9 +3869,8 @@
if ( VOS_FALSE == vos_is_macaddr_group( &pConfig->IbssBssid ))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_MED,
- "MAC Addr (IBSS BSSID) read from Registry is: %02x-%02x-%02x-%02x-%02x-%02x",
- pConfig->IbssBssid.bytes[0], pConfig->IbssBssid.bytes[1], pConfig->IbssBssid.bytes[2],
- pConfig->IbssBssid.bytes[3], pConfig->IbssBssid.bytes[4], pConfig->IbssBssid.bytes[5]);
+ "MAC Addr (IBSS BSSID) read from Registry is: " MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pConfig->IbssBssid.bytes));
if (ccmCfgSetStr(pHddCtx->hHal, WNI_CFG_BSSID, pConfig->IbssBssid.bytes,
sizeof(v_BYTE_t) * VOS_MAC_ADDR_SIZE, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
{
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 86de15b..13c3ec1 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -2778,14 +2778,8 @@
ndev->dev_addr[3] |= 0xF0;
memcpy(pAdapter->macAddressCurrent.bytes, ndev->dev_addr,
VOS_MAC_ADDR_SIZE);
- pr_info("wlan: Generated HotSpot BSSID "
- "%02x:%02x:%02x:%02x:%02x:%02x\n",
- ndev->dev_addr[0],
- ndev->dev_addr[1],
- ndev->dev_addr[2],
- ndev->dev_addr[3],
- ndev->dev_addr[4],
- ndev->dev_addr[5]);
+ pr_info("wlan: Generated HotSpot BSSID " MAC_ADDRESS_STR"\n",
+ MAC_ADDR_ARRAY(ndev->dev_addr));
}
hdd_set_ap_ops( pAdapter->dev );
@@ -4709,10 +4703,9 @@
{
staMac = (v_U8_t *) &(pAdapter->macAddressCurrent.bytes[0]);
hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: client %02x:%02x:%02x:%02x:%02x:%02x is in the "
- "middle of WPS/EAPOL exchange.", __func__,
- staMac[0], staMac[1], staMac[2],
- staMac[3], staMac[4], staMac[5]);
+ "%s: client " MAC_ADDRESS_STR
+ " is in the middle of WPS/EAPOL exchange.", __func__,
+ MAC_ADDR_ARRAY(staMac));
return VOS_FALSE;
}
}
@@ -4727,10 +4720,9 @@
staMac = (v_U8_t *) &(pAdapter->aStaInfo[staId].macAddrSTA.bytes[0]);
hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: client %02x:%02x:%02x:%02x:%02x:%02x of SoftAP/P2P-GO is in the "
- "middle of WPS/EAPOL exchange.", __func__,
- staMac[0], staMac[1], staMac[2],
- staMac[3], staMac[4], staMac[5]);
+ "%s: client " MAC_ADDRESS_STR " of SoftAP/P2P-GO is in the "
+ "middle of WPS/EAPOL exchange.", __func__,
+ MAC_ADDR_ARRAY(staMac));
return VOS_FALSE;
}
}
@@ -7353,11 +7345,9 @@
{
u8 *macAddr = pAdapter->aStaInfo[i].macAddrSTA.bytes;
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: Delete STA with MAC::"
- "%02x:%02x:%02x:%02x:%02x:%02x",
- __func__,
- macAddr[0], macAddr[1], macAddr[2],
- macAddr[3], macAddr[4], macAddr[5]);
+ "%s: Delete STA with MAC::"
+ MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(macAddr));
vos_status = hdd_softap_sta_deauth(pAdapter, macAddr);
if (VOS_IS_STATUS_SUCCESS(vos_status))
pAdapter->aStaInfo[i].isDeauthInProgress = TRUE;
@@ -7371,22 +7361,18 @@
if (!VOS_IS_STATUS_SUCCESS(vos_status))
{
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: Skip this DEL STA as this is not used::"
- "%02x:%02x:%02x:%02x:%02x:%02x",
- __func__,
- mac[0], mac[1], mac[2],
- mac[3], mac[4], mac[5]);
+ "%s: Skip this DEL STA as this is not used::"
+ MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(mac));
return -ENOENT;
}
if( pAdapter->aStaInfo[staId].isDeauthInProgress == TRUE)
{
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: Skip this DEL STA as deauth is in progress::"
- "%02x:%02x:%02x:%02x:%02x:%02x",
- __func__,
- mac[0], mac[1], mac[2],
- mac[3], mac[4], mac[5]);
+ "%s: Skip this DEL STA as deauth is in progress::"
+ MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(mac));
return -ENOENT;
}
@@ -7394,10 +7380,9 @@
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: Delete STA with MAC::"
- "%02x:%02x:%02x:%02x:%02x:%02x",
+ MAC_ADDRESS_STR,
__func__,
- mac[0], mac[1], mac[2],
- mac[3], mac[4], mac[5]);
+ MAC_ADDR_ARRAY(mac));
vos_status = hdd_softap_sta_deauth(pAdapter, mac);
if (!VOS_IS_STATUS_SUCCESS(vos_status))
@@ -7405,10 +7390,9 @@
pAdapter->aStaInfo[staId].isDeauthInProgress = FALSE;
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: STA removal failed for ::"
- "%02x:%02x:%02x:%02x:%02x:%02x",
+ MAC_ADDRESS_STR,
__func__,
- mac[0], mac[1], mac[2],
- mac[3], mac[4], mac[5]);
+ MAC_ADDR_ARRAY(mac));
return -ENOENT;
}
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index 736c96f..6639e21 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -4194,7 +4194,8 @@
return VOS_STATUS_E_FAILURE;
}
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "MacAddress = %02x:%02x:%02x:%02x:%02x:%02x",MAC_ADDR_ARRAY(macAddr));
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ "MacAddress = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr));
pMacAddress = &pMsgBody->SetNvField.fieldData.macAddr.macAddr1[0];
@@ -4203,7 +4204,8 @@
pMacAddress[ii] = (v_U8_t)macAddr[ii];
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "pMacAddress = %02x:%02x:%02x:%02x:%02x:%02x",MAC_ADDR_ARRAY(pMacAddress));
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ "pMacAddress = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pMacAddress));
status = wlan_ftm_postmsg((v_U8_t*)pMsgBuf,pMsgBuf->msgBodyLength);
if (status != VOS_STATUS_SUCCESS)
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 7a86b39..0375432 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1228,9 +1228,8 @@
i++;
cmd = (int)(*(value+i));
- hddLog(LOG1, "%s: SAP Modify ACL arg0 %02x:%02x:%02x:%02x:%02x:%02x arg1 %d arg2 %d\n",
- __func__, pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2],
- pPeerStaMac[3], pPeerStaMac[4], pPeerStaMac[5], listType, cmd);
+ hddLog(LOG1, "%s: SAP Modify ACL arg0 " MAC_ADDRESS_STR " arg1 %d arg2 %d",
+ __func__, MAC_ADDR_ARRAY(pPeerStaMac), listType, cmd);
if (WLANSAP_ModifyACL(pVosContext, pPeerStaMac,(eSapACLType)listType,(eSapACLCmdType)cmd)
!= VOS_STATUS_SUCCESS)
@@ -1477,9 +1476,8 @@
*/
peerMacAddr = (v_U8_t *)(extra);
- hddLog(LOG1, "data %02x:%02x:%02x:%02x:%02x:%02x",
- peerMacAddr[0], peerMacAddr[1], peerMacAddr[2],
- peerMacAddr[3], peerMacAddr[4], peerMacAddr[5]);
+ hddLog(LOG1, "%s data " MAC_ADDRESS_STR,
+ __func__, MAC_ADDR_ARRAY(peerMacAddr));
hdd_softap_sta_disassoc(pHostapdAdapter, peerMacAddr);
EXIT();
return 0;
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 6708060..ab1c79c 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -677,10 +677,9 @@
memcpy(&dstMac, &buf[WLAN_HDD_80211_FRM_DA_OFFSET], ETH_ALEN);
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: Deauth/Disassoc received for STA:"
- "%02x:%02x:%02x:%02x:%02x:%02x",
+ MAC_ADDRESS_STR,
__func__,
- dstMac[0], dstMac[1], dstMac[2],
- dstMac[3], dstMac[4], dstMac[5]);
+ MAC_ADDR_ARRAY(dstMac));
goto err_rem_channel;
}
}
diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c
index 42245d2..82b8ac4 100644
--- a/CORE/HDD/src/wlan_hdd_scan.c
+++ b/CORE/HDD/src/wlan_hdd_scan.c
@@ -233,13 +233,8 @@
char custom[MAX_CUSTOM_LEN];
char *p;
- hddLog( LOG1, "hdd_IndicateScanResult %02x:%02x:%02x:%02x:%02x:%02x",
- descriptor->bssId[0],
- descriptor->bssId[1],
- descriptor->bssId[2],
- descriptor->bssId[3],
- descriptor->bssId[4],
- descriptor->bssId[5]);
+ hddLog( LOG1, "hdd_IndicateScanResult " MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(descriptor->bssId));
error = 0;
last_event = current_event;
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index 0699d49..8e64efb 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -1552,29 +1552,14 @@
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
"register station \n");
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "station mac %02x:%02x:%02x:%02x:%02x:%02x",
- staDesc.vSTAMACAddress.bytes[0],
- staDesc.vSTAMACAddress.bytes[1],
- staDesc.vSTAMACAddress.bytes[2],
- staDesc.vSTAMACAddress.bytes[3],
- staDesc.vSTAMACAddress.bytes[4],
- staDesc.vSTAMACAddress.bytes[5]);
+ "station mac " MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(staDesc.vSTAMACAddress.bytes));
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "BSSIDforIBSS %02x:%02x:%02x:%02x:%02x:%02x",
- staDesc.vBSSIDforIBSS.bytes[0],
- staDesc.vBSSIDforIBSS.bytes[1],
- staDesc.vBSSIDforIBSS.bytes[2],
- staDesc.vBSSIDforIBSS.bytes[3],
- staDesc.vBSSIDforIBSS.bytes[4],
- staDesc.vBSSIDforIBSS.bytes[5]);
+ "BSSIDforIBSS " MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(staDesc.vBSSIDforIBSS.bytes));
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO,
- "SOFTAP SELFMAC %02x:%02x:%02x:%02x:%02x:%02x",
- staDesc.vSelfMACAddress.bytes[0],
- staDesc.vSelfMACAddress.bytes[1],
- staDesc.vSelfMACAddress.bytes[2],
- staDesc.vSelfMACAddress.bytes[3],
- staDesc.vSelfMACAddress.bytes[4],
- staDesc.vSelfMACAddress.bytes[5]);
+ "SOFTAP SELFMAC " MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(staDesc.vSelfMACAddress.bytes));
vosStatus = hdd_softap_init_tx_rx_sta(pAdapter, staId, &staDesc.vSTAMACAddress);
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index f3c5bf6..f54c5fe 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -3508,15 +3508,9 @@
&pAddBssParams->staContext.assocId, &psessionEntry->dph.dphHashTable);
if (pStaDs == NULL)
{
- PELOGE(limLog(pMac, LOGE, FL("Couldn't get assoc id for"
- "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x"),
- pAddBssParams->staContext.staMac[0],
- pAddBssParams->staContext.staMac[1],
- pAddBssParams->staContext.staMac[2],
- pAddBssParams->staContext.staMac[3],
- pAddBssParams->staContext.staMac[4],
- pAddBssParams->staContext.staMac[5]
- );)
+ PELOGE(limLog(pMac, LOGE, FL("Couldn't get assoc id for "
+ "MAC ADDR: " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac));)
}
pAddBssParams->staContext.uAPSD = 0;
pAddBssParams->staContext.maxSPLen = 0;
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index 78c2c30..0cf5b17 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -867,13 +867,8 @@
if( NULL == pSta )
{
PELOGE(limLog( pMac, LOGE,
- FL( "STA context not found for saved session's BSSID %02x:%02x:%02x:%02x:%02x:%02x" ),
- pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[0],
- pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[1],
- pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[2],
- pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[3],
- pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[4],
- pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[5] );)
+ FL( "STA context not found for saved session's BSSID " MAC_ADDRESS_STR ),
+ MAC_ADDR_ARRAY(pMac->ft.ftPEContext.pFTPreAuthReq->currbssId));)
return eSIR_FAILURE;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
index 5bf4232..48cea75 100644
--- a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
@@ -575,15 +575,10 @@
(tANI_U8 *) &pMlmDisassocReq->peerMacAddr,
sizeof(tSirMacAddr))))
{
- PELOGE(limLog(pMac, LOGE, FL("\nTODO:Ack for disassoc "
- "frame is pending Issue delsta for"
- " %02x:%02x:%02x:%02x:%02x:%02x"),
- pMlmDisassocReq->peerMacAddr[0],
- pMlmDisassocReq->peerMacAddr[1],
- pMlmDisassocReq->peerMacAddr[2],
- pMlmDisassocReq->peerMacAddr[3],
- pMlmDisassocReq->peerMacAddr[4],
- pMlmDisassocReq->peerMacAddr[5]);)
+ PELOGE(limLog(pMac, LOGE, FL("TODO:Ack for disassoc "
+ "frame is pending Issue delsta for "
+ MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pMlmDisassocReq->peerMacAddr));)
limProcessDisassocAckTimeout(pMac);
}
pMlmDeauthReq = pMac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq;
@@ -592,16 +587,10 @@
(tANI_U8 *) &pMlmDeauthReq->peerMacAddr,
sizeof(tSirMacAddr))))
{
- PELOGE(limLog(pMac, LOGE, FL("\nTODO:Ack for deauth frame "
+ PELOGE(limLog(pMac, LOGE, FL("TODO:Ack for deauth frame "
"is pending Issue delsta for "
- "%02x:%02x:%02x:%02x:%02x:%02x"),
- pMlmDeauthReq->peerMacAddr[0],
- pMlmDeauthReq->peerMacAddr[1],
- pMlmDeauthReq->peerMacAddr[2],
- pMlmDeauthReq->peerMacAddr[3],
- pMlmDeauthReq->peerMacAddr[4],
- pMlmDeauthReq->peerMacAddr[5]
- );)
+ MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pMlmDeauthReq->peerMacAddr));)
limProcessDeauthAckTimeout(pMac);
}
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 3052641..ace5106 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1446,13 +1446,9 @@
vos_mem_copy(&psessionEntry->p2pGoPsUpdate, limMsg->bodyptr,
sizeof(tSirP2PNoaAttr));
- limLog(pMac, LOG2, FL(" &psessionEntry->bssId%02x:%02x:%02x:%02x:%02x:%02x ctWin=%d oppPsFlag=%d"),
- psessionEntry->bssId[0],
- psessionEntry->bssId[1],
- psessionEntry->bssId[2],
- psessionEntry->bssId[3],
- psessionEntry->bssId[4],
- psessionEntry->bssId[5],
+ limLog(pMac, LOG2, FL(" &psessionEntry->bssId "
+ MAC_ADDRESS_STR " ctWin=%d oppPsFlag=%d"),
+ MAC_ADDR_ARRAY(psessionEntry->bssId),
psessionEntry->p2pGoPsUpdate.ctWin,
psessionEntry->p2pGoPsUpdate.oppPsFlag);
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 791fb4e..448bb1a 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -3237,13 +3237,8 @@
pAssocStasTemp->Support40Mhz = pStaDs->htDsssCckRate40MHzSupport;
limLog(pMac, LOG1, FL("dph Station Number = %d"), staCount+1);
- limLog(pMac, LOG1, FL("MAC = %02x:%02x:%02x:%02x:%02x:%02x"),
- pStaDs->staAddr[0],
- pStaDs->staAddr[1],
- pStaDs->staAddr[2],
- pStaDs->staAddr[3],
- pStaDs->staAddr[4],
- pStaDs->staAddr[5]);
+ limLog(pMac, LOG1, FL("MAC = " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pStaDs->staAddr));
limLog(pMac, LOG1, FL("Association Id = %d"),pStaDs->assocId);
limLog(pMac, LOG1, FL("Station Index = %d"),pStaDs->staIndex);
@@ -5192,13 +5187,7 @@
}
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- "Teardown for peer = %02x,%02x,%02x,%02x,%02x,%02x",
- teardownReq->peerMac[0],
- teardownReq->peerMac[1],
- teardownReq->peerMac[2],
- teardownReq->peerMac[3],
- teardownReq->peerMac[4],
- teardownReq->peerMac[5]) ;
+ "Teardown for peer = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(teardownReq->peerMac));
/*
* Now, go ahead and transmit TDLS teardown request, and save teardown info
* info for future reference.
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 6433fc5..ae17a02 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -582,13 +582,8 @@
tdlsDisReq.LinkIdentifier.bssid[4] = 0xde;
tdlsDisReq.LinkIdentifier.bssid[5] = 0xad;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Discovery Req"),
- tdlsDisReq.LinkIdentifier.bssid[0],
- tdlsDisReq.LinkIdentifier.bssid[1],
- tdlsDisReq.LinkIdentifier.bssid[2],
- tdlsDisReq.LinkIdentifier.bssid[3],
- tdlsDisReq.LinkIdentifier.bssid[4],
- tdlsDisReq.LinkIdentifier.bssid[5]);
+ ("TDLS negative running: wrong BSSID " MAC_ADDRESS_STR " in TDLS Discovery Req"),
+ MAC_ADDR_ARRAY(tdlsDisReq.LinkIdentifier.bssid));
}
#endif
status = dot11fPackTDLSDisReq( pMac, &tdlsDisReq, pFrame
@@ -702,13 +697,8 @@
else
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("DisRspTxComplete: staDs not found for %02x:%02x:%02x:%02x:%02x:%02x"),
- (peerInfo)->peerMac[0],
- (peerInfo)->peerMac[1],
- (peerInfo)->peerMac[2],
- (peerInfo)->peerMac[3],
- (peerInfo)->peerMac[4],
- (peerInfo)->peerMac[5]) ;
+ ("DisRspTxComplete: staDs not found for " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY((peerInfo)->peerMac));
VOS_ASSERT(0) ;
return eHAL_STATUS_FAILURE;
}
@@ -772,13 +762,8 @@
else
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("RSP-->SME peer MAC = %02x,%02x,%02x,%02x,%02x,%02x"),
- (peerInfo)->peerMac[0],
- (peerInfo)->peerMac[1],
- (peerInfo)->peerMac[2],
- (peerInfo)->peerMac[3],
- (peerInfo)->peerMac[4],
- (peerInfo)->peerMac[5]) ;
+ ("RSP-->SME peer MAC = " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY((peerInfo)->peerMac));
limSendSmeTdlsLinkStartRsp(pMac, eSIR_SUCCESS, (peerInfo)->peerMac,
eWNI_SME_TDLS_LINK_START_RSP) ;
@@ -822,13 +807,8 @@
}
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("teardown peer Mac = %02x,%02x,%02x,%02x,%02x,%02x"),
- (peerInfo)->peerMac[0],
- (peerInfo)->peerMac[1],
- (peerInfo)->peerMac[2],
- (peerInfo)->peerMac[3],
- (peerInfo)->peerMac[4],
- (peerInfo)->peerMac[5]);
+ ("teardown peer Mac = " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY((peerInfo)->peerMac));
//pMac->hal.pCBackFnTxComp = NULL ;
@@ -1109,13 +1089,8 @@
tdlsDisRsp.LinkIdentifier.bssid[4] = 0xde;
tdlsDisRsp.LinkIdentifier.bssid[5] = 0xad;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Discovery Rsp"),
- tdlsDisRsp.LinkIdentifier.bssid[0],
- tdlsDisRsp.LinkIdentifier.bssid[1],
- tdlsDisRsp.LinkIdentifier.bssid[2],
- tdlsDisRsp.LinkIdentifier.bssid[3],
- tdlsDisRsp.LinkIdentifier.bssid[4],
- tdlsDisRsp.LinkIdentifier.bssid[5]);
+ ("TDLS negative running: wrong BSSID " MAC_ADDRESS_STR " in TDLS Discovery Rsp"),
+ MAC_ADDR_ARRAY(tdlsDisRsp.LinkIdentifier.bssid));
}
#endif
status = dot11fPackTDLSDisRsp( pMac, &tdlsDisRsp, pFrame +
@@ -1377,13 +1352,8 @@
tdlsSetupReq.LinkIdentifier.bssid[4] = 0xde;
tdlsSetupReq.LinkIdentifier.bssid[5] = 0xad;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Setup Req"),
- tdlsSetupReq.LinkIdentifier.bssid[0],
- tdlsSetupReq.LinkIdentifier.bssid[1],
- tdlsSetupReq.LinkIdentifier.bssid[2],
- tdlsSetupReq.LinkIdentifier.bssid[3],
- tdlsSetupReq.LinkIdentifier.bssid[4],
- tdlsSetupReq.LinkIdentifier.bssid[5]);
+ ("TDLS negative running: wrong BSSID " MAC_ADDRESS_STR " in TDLS Setup Req"),
+ MAC_ADDR_ARRAY(tdlsSetupReq.LinkIdentifier.bssid));
}
#endif
limLog( pMac, LOGW, FL("%s: SupportedChnlWidth %x rxMCSMap %x rxMCSMap %x txSupDataRate %x"),
@@ -1792,13 +1762,8 @@
tdlsSetupRsp.LinkIdentifier.bssid[4] = 0xde;
tdlsSetupRsp.LinkIdentifier.bssid[5] = 0xad;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Setup Rsp"),
- tdlsSetupRsp.LinkIdentifier.bssid[0],
- tdlsSetupRsp.LinkIdentifier.bssid[1],
- tdlsSetupRsp.LinkIdentifier.bssid[2],
- tdlsSetupRsp.LinkIdentifier.bssid[3],
- tdlsSetupRsp.LinkIdentifier.bssid[4],
- tdlsSetupRsp.LinkIdentifier.bssid[5]);
+ ("TDLS negative running: wrong BSSID " MAC_ADDRESS_STR " in TDLS Setup Rsp"),
+ MAC_ADDR_ARRAY(tdlsSetupRsp.LinkIdentifier.bssid));
}
#endif
limLog( pMac, LOGW, FL("%s: SupportedChnlWidth %x rxMCSMap %x rxMCSMap %x txSupDataRate %x"),
@@ -2831,13 +2796,8 @@
{
peerInfo = &discoveryList->tdlsDisPeerInfo ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Peer in discovery list = %02x, %02x, %02x, %02x, %02x, %02x "),
- peerInfo->peerMac[0],
- peerInfo->peerMac[1],
- peerInfo->peerMac[2],
- peerInfo->peerMac[3],
- peerInfo->peerMac[4],
- peerInfo->peerMac[5]) ;
+ ("Peer in discovery list = " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(peerInfo->peerMac));
if (vos_mem_compare((tANI_U8 *) peerMac,
(tANI_U8 *) &peerInfo->peerMac, sizeof(tSirMacAddr)) )
@@ -2865,13 +2825,8 @@
{
peerInfo = &discoveryList->tdlsDisPeerInfo ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("peerInfo Mac = %02x, %02x, %02x, %02x, %02x, %02x "),
- peerInfo->peerMac[0],
- peerInfo->peerMac[1],
- peerInfo->peerMac[2],
- peerInfo->peerMac[3],
- peerInfo->peerMac[4],
- peerInfo->peerMac[5]) ;
+ ("peerInfo Mac = " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(peerInfo->peerMac));
if (peerInfo->tdlsPeerState == state)
{
@@ -2931,13 +2886,8 @@
sizeof(tSirMacAddr)) )
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Del Node for Peer = %02x,%02x,%02x,%02x,%02x,%02x"),
- currentNode->peerMac[0],
- currentNode->peerMac[1],
- currentNode->peerMac[2],
- currentNode->peerMac[3],
- currentNode->peerMac[4],
- currentNode->peerMac[5]) ;
+ ("Del Node for Peer = " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(currentNode->peerMac));
/* if it's first Node */
if(NULL == prevNode)
{
@@ -3003,13 +2953,8 @@
if(NULL == psessionEntry)
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
- tdlsDisReq.LinkIdentifier.bssid[0],
- tdlsDisReq.LinkIdentifier.bssid[1],
- tdlsDisReq.LinkIdentifier.bssid[2],
- tdlsDisReq.LinkIdentifier.bssid[3],
- tdlsDisReq.LinkIdentifier.bssid[4],
- tdlsDisReq.LinkIdentifier.bssid[5]) ;
+ ("no Session entry for TDLS session (bssid "MAC_ADDR_ARRAY")"),
+ MAC_ADDR_ARRAY(tdlsDisReq.LinkIdentifier.bssid));
//VOS_ASSERT(0) ;
return eSIR_FAILURE;
@@ -3019,23 +2964,12 @@
status = vos_mem_compare( &psessionEntry->bssId[0],
&tdlsDisReq.LinkIdentifier.bssid[0], sizeof(tSirMacAddr)) ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("lim BSSID %02x, %02x, %02x, %02x, %02x, %02x"),
- psessionEntry->bssId[0],
- psessionEntry->bssId[1],
- psessionEntry->bssId[2],
- psessionEntry->bssId[3],
- psessionEntry->bssId[4],
- psessionEntry->bssId[5]) ;
+ ("lim BSSID "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY( psessionEntry->bssId));
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Dis req from BSSID %02x, %02x, %02x, %02x, %02x, %02x"),
- tdlsDisReq.LinkIdentifier.bssid[0],
- tdlsDisReq.LinkIdentifier.bssid[1],
- tdlsDisReq.LinkIdentifier.bssid[2],
- tdlsDisReq.LinkIdentifier.bssid[3],
- tdlsDisReq.LinkIdentifier.bssid[4],
- tdlsDisReq.LinkIdentifier.bssid[5]
- ) ;
+ ("Dis req from BSSID "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(tdlsDisReq.LinkIdentifier.bssid));
if(!status)
{
limLog( pMac, LOGE, FL("TDLS discovery request frame from other BSS -> something wrong. Check RXP filter")) ;
@@ -3224,13 +3158,9 @@
if(NULL == psessionEntry)
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
- tdlsSetupReq.LinkIdentifier.bssid[0],
- tdlsSetupReq.LinkIdentifier.bssid[1],
- tdlsSetupReq.LinkIdentifier.bssid[2],
- tdlsSetupReq.LinkIdentifier.bssid[3],
- tdlsSetupReq.LinkIdentifier.bssid[4],
- tdlsSetupReq.LinkIdentifier.bssid[5]) ;
+ ("no Session entry for TDLS session (bssid "
+ MAC_ADDRESS_STR")"),
+ MAC_ADDR_ARRAY(tdlsSetupReq.LinkIdentifier.bssid));
//VOS_ASSERT(0) ;
return eSIR_FAILURE ;
@@ -3417,13 +3347,8 @@
sizeof(tSirMacAddr)) ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Setup REQ MAC = %02x,%02x, %02x, %02x, %02x, %02x"),
- setupPeer->peerMac[0],
- setupPeer->peerMac[1],
- setupPeer->peerMac[2],
- setupPeer->peerMac[3],
- setupPeer->peerMac[4],
- setupPeer->peerMac[5] ) ;
+ ("Setup REQ MAC = " MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(setupPeer->peerMac));
limTdlsUpdateLinkReqPeerInfo(pMac, setupPeer, &tdlsSetupReq) ;
pMac->lim.gLimAddStaTdls = true ;
@@ -3467,13 +3392,8 @@
sizeof(tSirMacAddr)) ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Setup REQ MAC = %02x,%02x, %02x, %02x, %02x, %02x"),
- setupPeer->peerMac[0],
- setupPeer->peerMac[1],
- setupPeer->peerMac[2],
- setupPeer->peerMac[3],
- setupPeer->peerMac[4],
- setupPeer->peerMac[5] ) ;
+ ("Setup REQ MAC = "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(setupPeer->peerMac));
limTdlsUpdateLinkReqPeerInfo(pMac, setupPeer, &tdlsSetupReq) ;
limSendTdlsSetupRspFrame(pMac, tdlsSetupReq.LinkIdentifier.InitStaAddr,
@@ -3532,13 +3452,9 @@
if(NULL == psessionEntry)
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
- tdlsSetupRsp.LinkIdentifier.bssid[0],
- tdlsSetupRsp.LinkIdentifier.bssid[1],
- tdlsSetupRsp.LinkIdentifier.bssid[2],
- tdlsSetupRsp.LinkIdentifier.bssid[3],
- tdlsSetupRsp.LinkIdentifier.bssid[4],
- tdlsSetupRsp.LinkIdentifier.bssid[5]) ;
+ ("no Session entry for TDLS session (bssid "
+ MAC_ADDRESS_STR")"),
+ MAC_ADDR_ARRAY(tdlsSetupRsp.LinkIdentifier.bssid));
//VOS_ASSERT(0) ;
return eSIR_FAILURE;
@@ -3561,13 +3477,7 @@
sizeof(tSirMacAddr)) ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("TDLS setup RSP peer = %02x,%02x,%02x,%02x,%02x,%02x"),
- peerMac[0],
- peerMac[1],
- peerMac[2],
- peerMac[3],
- peerMac[4],
- peerMac[5]) ;
+ ("TDLS setup RSP peer = "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac));
limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ;
if(NULL == setupPeer)
@@ -3669,13 +3579,9 @@
if(NULL == psessionEntry)
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
- tdlsSetupCnf.LinkIdentifier.bssid[0],
- tdlsSetupCnf.LinkIdentifier.bssid[1],
- tdlsSetupCnf.LinkIdentifier.bssid[2],
- tdlsSetupCnf.LinkIdentifier.bssid[3],
- tdlsSetupCnf.LinkIdentifier.bssid[4],
- tdlsSetupCnf.LinkIdentifier.bssid[5]) ;
+ ("no Session entry for TDLS session (bssid "
+ MAC_ADDRESS_STR")"),
+ MAC_ADDR_ARRAY(tdlsSetupCnf.LinkIdentifier.bssid));
//VOS_ASSERT(0) ;
return eSIR_FAILURE;
@@ -3695,14 +3601,8 @@
}
/* TODO, do more validation */
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("setup Cnf peer MAc = %02x,%02x,%02x,%02x,%02x,%02x"),
- tdlsSetupCnf.LinkIdentifier.InitStaAddr[0],
- tdlsSetupCnf.LinkIdentifier.InitStaAddr[1],
- tdlsSetupCnf.LinkIdentifier.InitStaAddr[2],
- tdlsSetupCnf.LinkIdentifier.InitStaAddr[3],
- tdlsSetupCnf.LinkIdentifier.InitStaAddr[4],
- tdlsSetupCnf.LinkIdentifier.InitStaAddr[5]
- ) ;
+ ("setup Cnf peer MAc = "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(tdlsSetupCnf.LinkIdentifier.InitStaAddr));
limTdlsFindLinkPeer(pMac,
&tdlsSetupCnf.LinkIdentifier.InitStaAddr[0],
@@ -3716,13 +3616,8 @@
return eSIR_FAILURE ;
}
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("setup CNF peer MAC = %02x,%02x,%02x,%02x,%02x,%02x"),
- (setupPeer)->peerMac[0],
- (setupPeer)->peerMac[1],
- (setupPeer)->peerMac[2],
- (setupPeer)->peerMac[3],
- (setupPeer)->peerMac[4],
- (setupPeer)->peerMac[5]) ;
+ ("setup CNF peer MAC = "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY((setupPeer)->peerMac));
/*T match dialog token, before proceeding further */
if((setupPeer)->dialog != tdlsSetupCnf.DialogToken.token)
{
@@ -3907,13 +3802,9 @@
if(NULL == psessionEntry)
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"),
- tdlsTeardown.LinkIdentifier.bssid[0],
- tdlsTeardown.LinkIdentifier.bssid[1],
- tdlsTeardown.LinkIdentifier.bssid[2],
- tdlsTeardown.LinkIdentifier.bssid[3],
- tdlsTeardown.LinkIdentifier.bssid[4],
- tdlsTeardown.LinkIdentifier.bssid[5]) ;
+ ("no Session entry for TDLS session (bssid "
+ MAC_ADDRESS_STR")"),
+ MAC_ADDR_ARRAY(tdlsTeardown.LinkIdentifier.bssid));
//VOS_ASSERT(0) ;
return eSIR_FAILURE;
@@ -3945,13 +3836,8 @@
return eSIR_FAILURE ;
}
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("teardown for peer %02x,%02x,%02x,%02x,%02x,%02x"),
- (setupPeer)->peerMac[0],
- (setupPeer)->peerMac[1],
- (setupPeer)->peerMac[2],
- (setupPeer)->peerMac[3],
- (setupPeer)->peerMac[4],
- (setupPeer)->peerMac[5]) ;
+ ("teardown for peer "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY((setupPeer)->peerMac));
switch(tdlsTeardown.Reason.code)
{
@@ -4091,13 +3977,8 @@
}
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("ADD STA peer MAC: %02x, %02x, %02x, %02x, %02x, %02x"),
- peerMac[0],
- peerMac[1],
- peerMac[2],
- peerMac[3],
- peerMac[4],
- peerMac[5]) ;
+ ("ADD STA peer MAC: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(peerMac));
if(NULL != dphLookupHashEntry(pMac, peerMac,
@@ -4182,13 +4063,8 @@
pStaDs->mlmStaContext.capabilityInfo = peerInfo->capabilityInfo;
vos_mem_copy( pStaDs->staAddr, peerMac, sizeof(tSirMacAddr)) ;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Add STA for Peer: %02x, %02x, %02x, %02x, %02x, %02x"),
- pStaDs->staAddr[0],
- pStaDs->staAddr[1],
- pStaDs->staAddr[2],
- pStaDs->staAddr[3],
- pStaDs->staAddr[4],
- pStaDs->staAddr[5]) ;
+ ("Add STA for Peer: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pStaDs->staAddr));
pStaDs->staType = STA_ENTRY_TDLS_PEER ;
@@ -4287,14 +4163,8 @@
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("DEL STA peer MAC: %02x, %02x, %02x, %02x, %02x, %02x "),
- pStaDs->staAddr[0],
- pStaDs->staAddr[1],
- pStaDs->staAddr[2],
- pStaDs->staAddr[3],
- pStaDs->staAddr[4],
- pStaDs->staAddr[5]
- ) ;
+ ("DEL STA peer MAC: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pStaDs->staAddr));
VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL,
("limTdlsDelSta: STA type = %x, sta idx = %x"),pStaDs->staType,
@@ -4339,9 +4209,8 @@
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: %02X %02X %02X %02X %02X %02X"),
- peerMac[0], peerMac[1], peerMac[2],
- peerMac[3], peerMac[4], peerMac[5]);
+ ("limTdlsLinkEstablish: cannot find peer mac in tdls linksetup list: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(peerMac));
return eSIR_FAILURE;
}
@@ -4543,13 +4412,8 @@
sizeof(tSirTdlsPeerInfo));
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- ("Msg Sent to PE, peer MAC: %02x, %02x, %02x, %02x, %02x, %02x"),
- peerInfo->peerMac[0],
- peerInfo->peerMac[1],
- peerInfo->peerMac[2],
- peerInfo->peerMac[3],
- peerInfo->peerMac[4],
- peerInfo->peerMac[5]);
+ ("Msg Sent to PE, peer MAC: "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(peerInfo->peerMac));
disStaCount-- ;
peerInfo++ ;
currentNode = tdlsDisRspList ;
@@ -4922,13 +4786,8 @@
SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL,
- ("limTdlsAddStaRsp: staIdx=%d, staMac=%02x:%02x:%02x:%02x:%02x:%02x"), pAddStaParams->staIdx,
- pAddStaParams->staMac[0],
- pAddStaParams->staMac[1],
- pAddStaParams->staMac[2],
- pAddStaParams->staMac[3],
- pAddStaParams->staMac[4],
- pAddStaParams->staMac[5] ) ;
+ ("limTdlsAddStaRsp: staIdx=%d, staMac="MAC_ADDRESS_STR), pAddStaParams->staIdx,
+ MAC_ADDR_ARRAY(pAddStaParams->staMac));
if (pAddStaParams->status != eHAL_STATUS_SUCCESS)
{
@@ -5564,9 +5423,8 @@
if (NULL != pStaDs)
{
- PELOGE(limLog(pMac, LOGE, FL("Deleting %02x:%02x:%02x:%02x:%02x:%02x"),
- pStaDs->staAddr[0], pStaDs->staAddr[1], pStaDs->staAddr[2],
- pStaDs->staAddr[3], pStaDs->staAddr[4], pStaDs->staAddr[5]);)
+ PELOGE(limLog(pMac, LOGE, FL("Deleting "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pStaDs->staAddr)););
limSendDeauthMgmtFrame(pMac, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
pStaDs->staAddr, psessionEntry, FALSE);
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c
index 57577f6..41909d9 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.c
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c
@@ -548,27 +548,12 @@
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
if (WDA_GET_OFFLOADSCANLEARN(pRxPacketInfo))
{
- limLog(pMac, LOG2, FL(" pHdr->addr1:%02x:%02x:%02x:%02x:%02x:%02x\n"),
- pHdr->addr1[0],
- pHdr->addr1[1],
- pHdr->addr1[2],
- pHdr->addr1[3],
- pHdr->addr1[4],
- pHdr->addr1[5]);
- limLog(pMac, LOG2, FL(" pHdr->addr2:%02x:%02x:%02x:%02x:%02x:%02x\n"),
- pHdr->addr2[0],
- pHdr->addr2[1],
- pHdr->addr2[2],
- pHdr->addr2[3],
- pHdr->addr2[4],
- pHdr->addr2[5]);
- limLog(pMac, LOG2, FL(" pHdr->addr3:%02x:%02x:%02x:%02x:%02x:%02x\n"),
- pHdr->addr3[0],
- pHdr->addr3[1],
- pHdr->addr3[2],
- pHdr->addr3[3],
- pHdr->addr3[4],
- pHdr->addr3[5]);
+ limLog(pMac, LOG2, FL(" pHdr->addr1:"MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pHdr->addr1));
+ limLog(pMac, LOG2, FL(" pHdr->addr2:"MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pHdr->addr2));
+ limLog(pMac, LOG2, FL(" pHdr->addr3:"MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pHdr->addr3));
limLog( pMac, LOG2, FL("Save this entry in LFR cache"));
status = limLookupNaddLfrHashEntry(pMac, pBssDescr, LIM_HASH_ADD, dontUpdateAll);
}
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index ebf0b44..c17ce16 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
@@ -2765,9 +2765,8 @@
pSmeMaxAssocInd->sessionId = smesessionId;
mmhMsg.type = pSmeMaxAssocInd->mesgType;
mmhMsg.bodyptr = pSmeMaxAssocInd;
- PELOG1(limLog(pMac, LOG1, FL("msgType %s peerMacAddr %02x-%02x-%02x-%02x-%02x-%02x"
- "sme session id %d"),"eWNI_SME_MAX_ASSOC_EXCEEDED", peerMacAddr[0], peerMacAddr[1],
- peerMacAddr[2], peerMacAddr[3], peerMacAddr[4], peerMacAddr[5], smesessionId);)
+ PELOG1(limLog(pMac, LOG1, FL("msgType %s peerMacAddr "MAC_ADDRESS_STR
+ " sme session id %d"), "eWNI_SME_MAX_ASSOC_EXCEEDED", MAC_ADDR_ARRAY(peerMacAddr));)
MTRACE(macTraceMsgTx(pMac, smesessionId, mmhMsg.type));
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index e5320b9..cca5579 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -1232,14 +1232,15 @@
void sapPrintACL(v_MACADDR_t *macList, v_U8_t size)
{
int i;
+ v_BYTE_t *macArray;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,"print acl entered");
if (size==0) return;
for (i=0; i<size; i++)
{
+ macArray = (macList+i)->bytes;
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "** ACL entry %i - %02x:%02x:%02x:%02x:%02x:%02x", i,
- (macList+i)->bytes[0], (macList+i)->bytes[1], (macList+i)->bytes[2],
- (macList+i)->bytes[3], (macList+i)->bytes[4], (macList+i)->bytes[5]);
+ "** ACL entry %i - "MAC_ADDRESS_STR, i,
+ MAC_ADDR_ARRAY(macArray));
}
return;
}
@@ -1255,8 +1256,9 @@
if (sapSearchMacList(sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL))
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x in deny list",
- __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ "In %s, Peer "MAC_ADDRESS_STR" in deny list",
+ __func__, MAC_ADDR_ARRAY(peerMac));
return VOS_STATUS_E_FAILURE;
}
@@ -1267,8 +1269,9 @@
// A new station CANNOT associate, unless in accept list. More stringent mode
if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode)
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED",
- __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ "In %s, Peer "MAC_ADDRESS_STR" denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED",
+ __func__, MAC_ADDR_ARRAY(peerMac));
return VOS_STATUS_E_FAILURE;
}
@@ -1278,8 +1281,9 @@
if (eSAP_SUPPORT_ACCEPT_AND_DENY == sapContext->eSapMacAddrAclMode)
{
sapSignalHDDevent(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN, (v_PVOID_t)peerMac);
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY",
- __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5));
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ "In %s, Peer "MAC_ADDRESS_STR" denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY",
+ __func__, MAC_ADDR_ARRAY(peerMac));
return VOS_STATUS_E_FAILURE;
}
return VOS_STATUS_SUCCESS;
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index 340fe50..f288dfb 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -1072,10 +1072,9 @@
if (staInWhiteList && staInBlackList)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "Peer mac %02x:%02x:%02x:%02x:%02x:%02x found in white and black lists."
+ "Peer mac "MAC_ADDRESS_STR" found in white and black lists."
"Initial lists passed incorrect. Cannot execute this command.",
- pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
- pPeerStaMac[4], pPeerStaMac[5]);
+ MAC_ADDR_ARRAY(pPeerStaMac));
return VOS_STATUS_E_FAILURE;
}
@@ -1091,18 +1090,16 @@
if (pSapCtx->nAcceptMac == MAX_ACL_MAC_ADDRESS)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "White list is already maxed out. Cannot accept %02x:%02x:%02x:%02x:%02x:%02x",
- pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
- pPeerStaMac[4], pPeerStaMac[5]);
+ "White list is already maxed out. Cannot accept "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pPeerStaMac));
return VOS_STATUS_E_FAILURE;
}
if (staInWhiteList)
{
//Do nothing if already present in white list. Just print a warning
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
- "MAC address already present in white list %02x:%02x:%02x:%02x:%02x:%02x",
- pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
- pPeerStaMac[4], pPeerStaMac[5]);
+ "MAC address already present in white list "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pPeerStaMac));
} else
{
if (staInBlackList)
@@ -1131,9 +1128,8 @@
else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
- "MAC address to be deleted is not present in the white list %02x:%02x:%02x:%02x:%02x:%02x",
- pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
- pPeerStaMac[4], pPeerStaMac[5]);
+ "MAC address to be deleted is not present in the white list "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pPeerStaMac));
return VOS_STATUS_E_FAILURE;
}
}
@@ -1154,18 +1150,16 @@
if (pSapCtx->nDenyMac == MAX_ACL_MAC_ADDRESS)
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- "Black list is already maxed out. Cannot accept %02x:%02x:%02x:%02x:%02x:%02x",
- pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
- pPeerStaMac[4], pPeerStaMac[5]);
+ "Black list is already maxed out. Cannot accept "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pPeerStaMac));
return VOS_STATUS_E_FAILURE;
}
if (staInBlackList)
{
//Do nothing if already present in white list
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
- "MAC address already present in black list %02x:%02x:%02x:%02x:%02x:%02x",
- pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
- pPeerStaMac[4], pPeerStaMac[5]);
+ "MAC address already present in black list "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pPeerStaMac));
} else
{
if (staInWhiteList)
@@ -1194,9 +1188,8 @@
else
{
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
- "MAC address to be deleted is not present in the black list %02x:%02x:%02x:%02x:%02x:%02x",
- pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3],
- pPeerStaMac[4], pPeerStaMac[5]);
+ "MAC address to be deleted is not present in the black list "MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(pPeerStaMac));
return VOS_STATUS_E_FAILURE;
}
}
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);