wlan: MAC Address Logging Fix.

Use pre-defined macro's to log MAC addresses.

Change-Id: Ia48be0eb3f4efe0f4f66752b852fe84bbe2e3344
CRs-Fixed:  573100
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);