qcacld-2.0: Modify SAP log for connect/Disconnect

prima to qcacld-2.0 propagation

As a part of logging improvement, modify redundant
logs, change certain log levels in STA connect/
disconnect path to make logs more useful.

Change-Id: I030f50cea88a7580cebbeafaccf7cd13787f653b
CRs-Fixed: 860526

4 files changed, 161 insertions, 94 deletions

diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index e867173c1f3b..98c5a6281f65 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -2528,8 +2528,8 @@ void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter,
     hdd_remain_on_chan_ctx_t* pRemainChanCtx = NULL;
     hdd_context_t *pHddCtx;
 
-    hddLog(VOS_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d",
-            __func__, frameType, nFrameLength);
+    hddLog(VOS_TRACE_LEVEL_INFO, FL("Frame Type = %d Frame Length = %d"),
+            frameType, nFrameLength);
 
     if (NULL == pAdapter)
     {
diff --git a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
index 5ce133d0bd5b..cd0763cd26ff 100644
--- a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
@@ -603,7 +603,7 @@ limIndicateProbeReqToHDD(tpAniSirGlobal pMac, tANI_U8 *pBd,
     tpSirMacMgmtHdr     pHdr;
     tANI_U32            frameLen;
 
-    limLog( pMac, LOG1, "Received a probe request frame");
+    limLog( pMac, LOG1, FL("Received a probe request frame"));
 
     pHdr = WDA_GET_RX_MAC_HEADER(pBd);
     frameLen = WDA_GET_RX_PAYLOAD_LEN(pBd);
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index 0f8570b36d3c..1fd375a91695 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -580,13 +580,16 @@ WLANSAP_RoamCallback
         pMac = PMAC_STRUCT( hHal );
     }
 
-    VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamStatus = %d\n", __func__, roamStatus);
+    VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                 FL("before switch on roamStatus = %d"),
+                 roamStatus);
     switch(roamStatus)
     {
         case eCSR_ROAM_SESSION_OPENED:
         {
             VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
-                      "In %s calling sme_RoamConnect with eCSR_BSS_TYPE_INFRA_AP", __func__);
+                      FL("Before switch on roamStatus = %d"),
+                                 roamStatus);
             sapContext->isSapSessionOpen = eSAP_TRUE;
             halStatus = sme_RoamConnect(hHal, sapContext->sessionId,
                                         &sapContext->csrRoamProfile,
@@ -595,8 +598,9 @@ WLANSAP_RoamCallback
         }
 
         case eCSR_ROAM_INFRA_IND:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
-                      __func__, "eCSR_ROAM_INFRA_IND", roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                           "eCSR_ROAM_INFRA_IND", roamStatus);
             if(roamResult == eCSR_ROAM_RESULT_INFRA_START_FAILED)
             {
                 /* Fill in the event structure */
@@ -615,18 +619,21 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_LOSTLINK:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
-                       __func__, "eCSR_ROAM_LOSTLINK", roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_LOSTLINK", roamStatus);
             break;
 
         case eCSR_ROAM_MIC_ERROR_IND:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
-                __func__, "eCSR_ROAM_MIC_ERROR_IND", roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_MIC_ERROR_IND", roamStatus);
             break;
 
         case eCSR_ROAM_SET_KEY_COMPLETE:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
-                __func__, "eCSR_ROAM_SET_KEY_COMPLETE", roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_SET_KEY_COMPLETE", roamStatus);
             if (roamResult == eCSR_ROAM_RESULT_FAILURE )
             {
                 /* Format the SET KEY complete information pass to HDD... */
@@ -635,8 +642,9 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_REMOVE_KEY_COMPLETE:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
-                        __func__, "eCSR_ROAM_REMOVE_KEY_COMPLETE", roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_REMOVE_KEY_COMPLETE", roamStatus);
             if (roamResult == eCSR_ROAM_RESULT_FAILURE )
             {
                 /* Format the SET KEY complete information pass to HDD... */
@@ -645,8 +653,9 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_ASSOCIATION_COMPLETION:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
-                       __func__, "eCSR_ROAM_ASSOCIATION_COMPLETION", roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_ASSOCIATION_COMPLETION", roamStatus);
             if (roamResult == eCSR_ROAM_RESULT_FAILURE )
             {
                 /* Format the SET KEY complete information pass to HDD... */
@@ -655,8 +664,9 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_DISASSOCIATED:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
-                       __func__, "eCSR_ROAM_DISASSOCIATED", roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_DISASSOCIATED", roamStatus);
             if (roamResult == eCSR_ROAM_RESULT_MIC_FAILURE)
             {
                 /* Format the MIC failure event to return... */
@@ -665,21 +675,31 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_WPS_PBC_PROBE_REQ_IND:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamStatus = %s (%d)\n",
-                       __func__, "eCSR_ROAM_WPS_PBC_PROBE_REQ_IND", roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_WPS_PBC_PROBE_REQ_IND", roamStatus);
             break;
 
         case eCSR_ROAM_INDICATE_MGMT_FRAME:
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_INDICATE_MGMT_FRAME", roamStatus);
             sapSignalHDDevent(sapContext, pCsrRoamInfo,
                               eSAP_INDICATE_MGMT_FRAME,
                               (v_PVOID_t) eSAP_STATUS_SUCCESS);
             break;
         case eCSR_ROAM_REMAIN_CHAN_READY:
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_REMAIN_CHAN_READY", roamStatus);
             sapSignalHDDevent(sapContext, pCsrRoamInfo,
                               eSAP_REMAIN_CHAN_READY,
                               (v_PVOID_t) eSAP_STATUS_SUCCESS);
             break;
         case eCSR_ROAM_SEND_ACTION_CNF:
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_SEND_ACTION_CNF", roamStatus);
             sapSignalHDDevent(sapContext, pCsrRoamInfo,
                             eSAP_SEND_ACTION_CNF,
                             (v_PVOID_t)((eSapStatus)((roamResult == eCSR_ROAM_RESULT_NONE)
@@ -687,13 +707,17 @@ WLANSAP_RoamCallback
             break;
 
        case eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS:
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                        FL("CSR roamStatus = %s (%d)"),
+                        "eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS", roamStatus);
             sapSignalHDDevent(sapContext, pCsrRoamInfo,
                             eSAP_DISCONNECT_ALL_P2P_CLIENT,
                             (v_PVOID_t) eSAP_STATUS_SUCCESS );
             break;
 
        case eCSR_ROAM_SEND_P2P_STOP_BSS:
-           VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Received stopbss", __func__);
+           VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                             FL("Received stopbss"));
            sapSignalHDDevent(sapContext, pCsrRoamInfo,
                             eSAP_MAC_TRIG_STOP_BSS_EVENT,
                             (v_PVOID_t) eSAP_STATUS_SUCCESS );
@@ -772,20 +796,21 @@ WLANSAP_RoamCallback
                    "In %s, Received set channel Indication", __func__);
            break;
        default:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, CSR roamStatus not handled roamStatus = %s (%d)\n",
-                       __func__, get_eRoamCmdStatus_str(roamStatus), roamStatus);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+                         FL("CSR roamStatus not handled roamStatus = %s (%d)"),
+                         get_eRoamCmdStatus_str(roamStatus), roamStatus);
             break;
 
     }
-
-    VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, before switch on roamResult = %d\n",
-               __func__, roamResult);
-
+    VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                   FL("Before switch on roamResult = %d"), roamResult);
     switch (roamResult)
     {
         case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                       __func__, "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                         FL( "CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND",
+                              roamResult);
             sapContext->nStaWPARSnReqIeLength = pCsrRoamInfo->rsnIELen;
 
             if(sapContext->nStaWPARSnReqIeLength)
@@ -815,8 +840,9 @@ WLANSAP_RoamCallback
                 if(!VOS_IS_STATUS_SUCCESS(vosStatus))
                 {
                    VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
-                             "In %s, CSR roamResult = (%d) MAC ("
-                             MAC_ADDRESS_STR") fail", __func__, roamResult,
+                             FL("CSR roamResult = (%d) MAC ("
+                             MAC_ADDRESS_STR") fail"),
+                             roamResult,
                              MAC_ADDR_ARRAY(pCsrRoamInfo->peerMac));
                     halStatus = eHAL_STATUS_FAILURE;
                 }
@@ -824,8 +850,9 @@ WLANSAP_RoamCallback
             else
             {
                 VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN,
-                          "In %s, CSR roamResult = (%d) MAC ("
-                          MAC_ADDRESS_STR") not allowed", __func__, roamResult,
+                          FL("CSR roamResult = (%d) MAC ("
+                          MAC_ADDRESS_STR") not allowed"),
+                          roamResult,
                           MAC_ADDR_ARRAY(pCsrRoamInfo->peerMac));
                 halStatus = eHAL_STATUS_FAILURE;
             }
@@ -833,8 +860,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                        __func__, "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF",
+                              roamResult);
 
             sapContext->nStaWPARSnReqIeLength = pCsrRoamInfo->rsnIELen;
             if (sapContext->nStaWPARSnReqIeLength)
@@ -856,8 +885,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_DISASSOC_IND:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                        __func__, "eCSR_ROAM_RESULT_DISASSOC_IND", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_DISASSOC_IND",
+                              roamResult);
             /* Fill in the event structure */
             vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_DISASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
             if(!VOS_IS_STATUS_SUCCESS(vosStatus))
@@ -867,8 +898,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_DEAUTH_IND:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                       __func__, "eCSR_ROAM_RESULT_DEAUTH_IND", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_DEAUTH_IND",
+                              roamResult);
             /* Fill in the event structure */
             //TODO: we will use the same event inorder to inform HDD to disassociate the station
             vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_DISASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
@@ -879,8 +912,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_MIC_ERROR_GROUP:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                        __func__, "eCSR_ROAM_RESULT_MIC_ERROR_GROUP", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_MIC_ERROR_GROUP",
+                              roamResult);
             /* Fill in the event structure */
             //TODO: support for group key MIC failure event to be handled
             vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_MIC_FAILURE_EVENT,(v_PVOID_t) NULL);
@@ -891,8 +926,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                       __func__, "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_MIC_ERROR_UNICAST",
+                              roamResult);
             /* Fill in the event structure */
             //TODO: support for unicast key MIC failure event to be handled
             vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_MIC_FAILURE_EVENT,(v_PVOID_t) NULL);
@@ -903,8 +940,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_AUTHENTICATED:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                       __func__, "eCSR_ROAM_RESULT_AUTHENTICATED", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_AUTHENTICATED",
+                              roamResult);
             /* Fill in the event structure */
             sapSignalHDDevent( sapContext, pCsrRoamInfo,eSAP_STA_SET_KEY_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
             if(!VOS_IS_STATUS_SUCCESS(vosStatus))
@@ -914,15 +953,19 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_ASSOCIATED:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                       __func__, "eCSR_ROAM_RESULT_ASSOCIATED", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_ASSOCIATED",
+                              roamResult);
             /* Fill in the event structure */
             sapSignalHDDevent( sapContext, pCsrRoamInfo,eSAP_STA_REASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
             break;
 
         case eCSR_ROAM_RESULT_INFRA_STARTED:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                       __func__, "eCSR_ROAM_RESULT_INFRA_STARTED", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_INFRA_STARTED",
+                              roamResult);
 
             /* In the current implementation, hostapd is not aware that
              * drive will support DFS. Hence, driver should inform
@@ -942,8 +985,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_INFRA_STOPPED:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                       __func__, "eCSR_ROAM_RESULT_INFRA_STOPPED", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_INFRA_STOPPED",
+                              roamResult);
             /* Fill in the event structure */
             sapEvent.event = eSAP_MAC_READY_FOR_CONNECTIONS;
             sapEvent.params = pCsrRoamInfo;
@@ -959,8 +1004,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                        __func__, "eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND",
+                              roamResult);
             /* Fill in the event structure */
             //TODO: support for group key MIC failure event to be handled
             vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_WPS_PBC_PROBE_REQ_EVENT,(v_PVOID_t) NULL);
@@ -971,16 +1018,20 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_FORCED:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                       __func__, "eCSR_ROAM_RESULT_FORCED", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_FORCED",
+                              roamResult);
             //This event can be used to inform hdd about user triggered disassoc event
             /* Fill in the event structure */
             sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_DISASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
             break;
 
         case eCSR_ROAM_RESULT_NONE:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                    __func__, "eCSR_ROAM_RESULT_NONE", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_NONE",
+                              roamResult);
             //This event can be used to inform hdd about user triggered disassoc event
             /* Fill in the event structure */
             if ( roamStatus == eCSR_ROAM_SET_KEY_COMPLETE)
@@ -994,8 +1045,10 @@ WLANSAP_RoamCallback
             break;
 
         case eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, CSR roamResult = %s (%d)\n",
-                    __func__, "eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED", roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                          FL("CSR roamResult = %s (%d)"),
+                             "eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED",
+                              roamResult);
             /* Fill in the event structure */
             vosStatus = sapSignalHDDevent(sapContext, pCsrRoamInfo, eSAP_MAX_ASSOC_EXCEEDED, (v_PVOID_t)NULL);
             if(!VOS_IS_STATUS_SUCCESS(vosStatus))
@@ -1347,8 +1400,10 @@ WLANSAP_RoamCallback
             break;
         }
         default:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, CSR roamResult = %s (%d) not handled\n",
-                       __func__,get_eCsrRoamResult_str(roamResult),roamResult);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+                          FL("CSR roamResult = %s (%d) not handled"),
+                             get_eCsrRoamResult_str(roamResult),
+                             roamResult);
             break;
     }
 
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index c2506e1fae71..5d4ee2441c67 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -2670,8 +2670,9 @@ sapSignalHDDevent
             }
             break;
        case eSAP_START_BSS_EVENT:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
-                __func__, "eSAP_START_BSS_EVENT");
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                       "eSAP_START_BSS_EVENT");
             sapApAppEvent.sapHddEventCode = eSAP_START_BSS_EVENT;
             sapApAppEvent.sapevt.sapStartBssCompleteEvent.status = (eSapStatus )context;
             if(pCsrRoamInfo != NULL ){
@@ -2728,8 +2729,9 @@ sapSignalHDDevent
             break;
 
         case eSAP_STOP_BSS_EVENT:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
-                       __func__, "eSAP_STOP_BSS_EVENT");
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                          "eSAP_STOP_BSS_EVENT");
             sapApAppEvent.sapHddEventCode = eSAP_STOP_BSS_EVENT;
             sapApAppEvent.sapevt.sapStopBssCompleteEvent.status = (eSapStatus )context;
             break;
@@ -2738,8 +2740,9 @@ sapSignalHDDevent
         case eSAP_STA_REASSOC_EVENT:
         {
             tSirSmeChanInfo *pChanInfo;
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
-                __func__, "eSAP_STA_ASSOC_EVENT");
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                          "eSAP_STA_ASSOC_EVENT");
             if (pCsrRoamInfo->fReassocReq)
                 sapApAppEvent.sapHddEventCode = eSAP_STA_REASSOC_EVENT;
             else
@@ -2798,8 +2801,9 @@ sapSignalHDDevent
         }
 
         case eSAP_STA_DISASSOC_EVENT:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
-                       __func__, "eSAP_STA_DISASSOC_EVENT");
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                          "eSAP_STA_DISASSOC_EVENT");
             sapApAppEvent.sapHddEventCode = eSAP_STA_DISASSOC_EVENT;
 
             vos_mem_copy( &sapApAppEvent.sapevt.sapStationDisassocCompleteEvent.staMac,
@@ -2815,8 +2819,9 @@ sapSignalHDDevent
             break;
 
         case eSAP_STA_SET_KEY_EVENT:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
-                       __func__, "eSAP_STA_SET_KEY_EVENT");
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                          "eSAP_STA_SET_KEY_EVENT");
             sapApAppEvent.sapHddEventCode = eSAP_STA_SET_KEY_EVENT;
             sapApAppEvent.sapevt.sapStationSetKeyCompleteEvent.status = (eSapStatus )context;
             vos_mem_copy(&sapApAppEvent.sapevt.sapStationSetKeyCompleteEvent.peerMacAddr,
@@ -2824,8 +2829,9 @@ sapSignalHDDevent
             break;
 
         case eSAP_STA_DEL_KEY_EVENT :
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
-                       __func__, "eSAP_STA_DEL_KEY_EVENT");
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                          "eSAP_STA_DEL_KEY_EVENT");
             sapApAppEvent.sapHddEventCode = eSAP_STA_DEL_KEY_EVENT;
             sapApAppEvent.sapevt.sapStationDeleteKeyCompleteEvent.status = (eSapStatus )context;
             //TODO: Should we need to send the key information
@@ -2833,8 +2839,9 @@ sapSignalHDDevent
             break;
 
         case eSAP_STA_MIC_FAILURE_EVENT :
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
-                        __func__, "eSAP_STA_MIC_FAILURE_EVENT");
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                          "eSAP_STA_MIC_FAILURE_EVENT");
             sapApAppEvent.sapHddEventCode = eSAP_STA_MIC_FAILURE_EVENT;
             vos_mem_copy( &sapApAppEvent.sapevt.sapStationMICFailureEvent.srcMacAddr,
                           pCsrRoamInfo->u.pMICFailureInfo->srcMacAddr,
@@ -2854,11 +2861,15 @@ sapSignalHDDevent
             break;
 
         case eSAP_ASSOC_STA_CALLBACK_EVENT:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s",
-                       __func__, "eSAP_ASSOC_STA_CALLBACK_EVENT");
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                          "eSAP_ASSOC_STA_CALLBACK_EVENT");
             break;
 
         case eSAP_WPS_PBC_PROBE_REQ_EVENT:
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+                       FL("SAP event callback event = %s"),
+                          "eSAP_WPS_PBC_PROBE_REQ_EVENT");
             sapApAppEvent.sapHddEventCode = eSAP_WPS_PBC_PROBE_REQ_EVENT;
 
             vos_mem_copy( &sapApAppEvent.sapevt.sapPBCProbeReqEvent.WPSPBCProbeReq,
@@ -2868,8 +2879,8 @@ sapSignalHDDevent
 
        case eSAP_INDICATE_MGMT_FRAME:
             VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
-                                 "In %s, SAP event callback event = %s",
-                                __func__, "eSAP_INDICATE_MGMT_FRAME");
+                       FL("SAP event callback event = %s"),
+                          "eSAP_INDICATE_MGMT_FRAME");
             sapApAppEvent.sapHddEventCode = eSAP_INDICATE_MGMT_FRAME;
             sapApAppEvent.sapevt.sapManagementFrameInfo.nFrameLength
                                            = pCsrRoamInfo->nFrameLength;
@@ -2883,30 +2894,30 @@ sapSignalHDDevent
             break;
        case eSAP_REMAIN_CHAN_READY:
             VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
-                                 "In %s, SAP event callback event = %s",
-                                __func__, "eSAP_REMAIN_CHAN_READY");
+                       FL("SAP event callback event = %s"),
+                          "eSAP_REMAIN_CHAN_READY");
            sapApAppEvent.sapHddEventCode = eSAP_REMAIN_CHAN_READY;
             break;
        case eSAP_SEND_ACTION_CNF:
             VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
-                                 "In %s, SAP event callback event = %s",
-                                __func__, "eSAP_SEND_ACTION_CNF");
+                       FL("SAP event callback event = %s"),
+                          "eSAP_SEND_ACTION_CNF");
             sapApAppEvent.sapHddEventCode = eSAP_SEND_ACTION_CNF;
             sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
             break;
 
        case eSAP_DISCONNECT_ALL_P2P_CLIENT:
             VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
-                             "In %s, SAP event callback event = %s",
-                            __func__, "eSAP_DISCONNECT_ALL_P2P_CLIENT");
+                       FL("SAP event callback event = %s"),
+                          "eSAP_DISCONNECT_ALL_P2P_CLIENT");
             sapApAppEvent.sapHddEventCode = eSAP_DISCONNECT_ALL_P2P_CLIENT;
             sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
             break;
 
        case eSAP_MAC_TRIG_STOP_BSS_EVENT :
             VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
-                             "In %s, SAP event callback event = %s",
-                            __func__, "eSAP_MAC_TRIG_STOP_BSS_EVENT");
+                       FL("SAP event callback event = %s"),
+                          "eSAP_MAC_TRIG_STOP_BSS_EVENT");
             sapApAppEvent.sapHddEventCode = eSAP_MAC_TRIG_STOP_BSS_EVENT;
             sapApAppEvent.sapevt.sapActionCnf.actionSendSuccess = (eSapStatus)context;
             break;
@@ -2914,8 +2925,8 @@ sapSignalHDDevent
 
         case eSAP_UNKNOWN_STA_JOIN:
             VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
-                       "In %s, SAP event callback event = %s",
-                       __func__, "eSAP_UNKNOWN_STA_JOIN");
+                       FL("SAP event callback event = %s"),
+                          "eSAP_UNKNOWN_STA_JOIN");
             sapApAppEvent.sapHddEventCode = eSAP_UNKNOWN_STA_JOIN;
             vos_mem_copy((v_PVOID_t)sapApAppEvent.sapevt.sapUnknownSTAJoin.macaddr.bytes,
                          (v_PVOID_t)context, sizeof(v_MACADDR_t));
@@ -2923,8 +2934,8 @@ sapSignalHDDevent
 
         case eSAP_MAX_ASSOC_EXCEEDED:
             VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
-                    "In %s, SAP event callback event = %s",
-                    __func__, "eSAP_MAX_ASSOC_EXCEEDED");
+                       FL("SAP event callback event = %s"),
+                          "eSAP_MAX_ASSOC_EXCEEDED");
             sapApAppEvent.sapHddEventCode = eSAP_MAX_ASSOC_EXCEEDED;
             vos_mem_copy((v_PVOID_t)sapApAppEvent.sapevt.sapMaxAssocExceeded.macaddr.bytes,
                     (v_PVOID_t)pCsrRoamInfo->peerMac, sizeof(v_MACADDR_t));
@@ -2985,8 +2996,9 @@ sapSignalHDDevent
                                            pCsrRoamInfo->target_channel;
             break;
         default:
-            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, "In %s, SAP Unknown callback event = %d",
-                       __func__,sapHddevent);
+            VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+                       FL("SAP Unknown callback event = %d"),
+                     sapHddevent);
             break;
     }
     vosStatus = (*sapContext->pfnSapEventCallback)