wlan: Resolve unknown code issues in MTRACE logs

Some MTRACE logs returns 'unknown code' instead of code and data passed
to MTRACE. To resolve this unknown code issues in MTRACE logs,
add any missing MTRACE code enums in corresponding trace functions.
Both macTraceMsgTx() and macTraceMsgRx() were not handling eWniMsgTypes
enums, we don't have module Id for SME to handle in those functions
itself. So, modified macTraceMsgTx() to macTrace().

Change-Id: Ia994c971178e24843f652b67336afeaec5e949ab
CRs-Fixed: 871983
diff --git a/CORE/HDD/src/wlan_hdd_trace.c b/CORE/HDD/src/wlan_hdd_trace.c
index fb109f6..766431e 100644
--- a/CORE/HDD/src/wlan_hdd_trace.c
+++ b/CORE/HDD/src/wlan_hdd_trace.c
@@ -77,6 +77,12 @@
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SCAN);
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START);
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SET_CHANNEL);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_ADD_BEACON);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SET_BEACON);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_CHANGE_IFACE);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_CHANGE_STATION);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_UPDATE_BSS);
            CASE_RETURN_STRING(TRACE_CODE_HDD_REMAIN_ON_CHANNEL);
            CASE_RETURN_STRING(TRACE_CODE_HDD_REMAINCHANREADYHANDLER);
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_CANCEL_REMAIN_ON_CHANNEL);
@@ -90,6 +96,8 @@
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_DEL_PMKSA);
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES);
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_TDLS_MGMT);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_TDLS_OPER);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SET_REKEY_DATA);
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_RESUME_WLAN);
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN);
            CASE_RETURN_STRING(TRACE_CODE_HDD_CFG80211_SET_MAC_ACL);
@@ -98,6 +106,9 @@
            CASE_RETURN_STRING(TRACE_CODE_HDD_UNSUPPORTED_IOCTL);
            CASE_RETURN_STRING(TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL);
            CASE_RETURN_STRING(TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_STOP_NETDEV);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_WAKE_NETDEV);
+           CASE_RETURN_STRING(TRACE_CODE_HDD_FLUSH_TX_QUEUES);
            default:
                return ("UNKNOWN");
                break;
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index f76249c..340196e 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -94,8 +94,7 @@
 #define AGN1223AR_02      8
 #define AGN_EEP_PRODUCT_ID_MAX   8
 
-
-
+#define SIR_SME_MODULE_ID 0x16
 
 /// Start of Sirius/Host message types
 #define WNI_HOST_MSG_START             0x1500
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index f769de6..fd5fadc 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -625,7 +625,6 @@
 #define SIR_HAL_DHCP_STOP_IND              (SIR_HAL_ITC_MSG_TYPES_BEGIN + 205)
 #define SIR_HAL_IBSS_PEER_INACTIVITY_IND   (SIR_HAL_ITC_MSG_TYPES_BEGIN + 206)
 
-#define SIR_HAL_LPHB_CONF_IND              (SIR_HAL_ITC_MSG_TYPES_BEGIN + 206)
 #define SIR_HAL_LPHB_WAIT_EXPIRE_IND       (SIR_HAL_ITC_MSG_TYPES_BEGIN + 207)
 
 #define SIR_HAL_ADD_PERIODIC_TX_PTRN_IND   (SIR_HAL_ITC_MSG_TYPES_BEGIN + 208)
@@ -714,6 +713,8 @@
 #define SIR_HAL_MON_STOP_REQ                (SIR_HAL_ITC_MSG_TYPES_BEGIN + 270)
 #define SIR_HAL_FATAL_EVENT_LOGS_REQ         (SIR_HAL_ITC_MSG_TYPES_BEGIN + 271)
 
+#define SIR_HAL_LPHB_CONF_IND              (SIR_HAL_ITC_MSG_TYPES_BEGIN + 272)
+
 #define SIR_HAL_MSG_TYPES_END              (SIR_HAL_MSG_TYPES_BEGIN + 0x1FF)
 // CFG message types
 #define SIR_CFG_MSG_TYPES_BEGIN        (SIR_CFG_MODULE_ID << 8)
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 3829ea5..6f75040 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -2242,7 +2242,7 @@
     mmhMsg.type = eWNI_SME_MIC_FAILURE_IND;
     mmhMsg.bodyptr = pSirSmeMicFailureInd;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, sessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, sessionId, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
     return;
 }
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 70b4983..47323eb 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1287,17 +1287,29 @@
       limMsgStr(limMsg->type), limSmeStateStr(pMac->lim.gLimSmeState),
       limMlmStateStr(pMac->lim.gLimMlmState));)
 
-   /* Omitting below message types as these are too frequent and when crash
-    * happens we loose critical trace logs if these are also logged
+   /*
+    * MTRACE logs not captured for events received from SME
+    * SME enums (eWNI_SME_START_REQ) starts with 0x16xx.
+    * Compare received SME events with SIR_SME_MODULE_ID
     */
-   if (limMsg->type != SIR_LIM_MAX_CHANNEL_TIMEOUT &&
-       limMsg->type != SIR_LIM_MIN_CHANNEL_TIMEOUT &&
-       limMsg->type != SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT &&
-       limMsg->type != SIR_CFG_PARAM_UPDATE_IND &&
-       limMsg->type != SIR_BB_XPORT_MGMT_MSG)
-          MTRACE(macTraceMsgRx(pMac, NO_SESSION,
-                 LIM_TRACE_MAKE_RXMSG(limMsg->type, LIM_MSG_PROCESSED));)
 
+    if (SIR_SME_MODULE_ID == (tANI_U8)MAC_TRACE_GET_MODULE_ID(limMsg->type))
+    {
+       MTRACE(macTrace(pMac, TRACE_CODE_RX_SME_MSG, NO_SESSION, limMsg->type));
+    }
+    else
+    {
+       /* Omitting below message types as these are too frequent and when crash
+        * happens we loose critical trace logs if these are also logged
+        */
+       if (limMsg->type != SIR_LIM_MAX_CHANNEL_TIMEOUT &&
+           limMsg->type != SIR_LIM_MIN_CHANNEL_TIMEOUT &&
+           limMsg->type != SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT &&
+           limMsg->type != SIR_CFG_PARAM_UPDATE_IND &&
+           limMsg->type != SIR_BB_XPORT_MGMT_MSG)
+              MTRACE(macTraceMsgRx(pMac, NO_SESSION,
+                      LIM_TRACE_MAKE_RXMSG(limMsg->type, LIM_MSG_PROCESSED));)
+    }
     switch (limMsg->type)
     {
 
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index c76cfa5..042faff 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -1073,7 +1073,7 @@
     msgQ.type = eWNI_SME_REASSOC_IND;
     msgQ.bodyptr = pSirSmeReassocInd;
     msgQ.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, msgQ.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, psessionEntry->peSessionId, msgQ.type));
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT
     limDiagEventReport(pMac, WLAN_PE_DIAG_REASSOC_IND_EVENT, psessionEntry, 0, 0);
 #endif //FEATURE_WLAN_DIAG_SUPPORT
@@ -1138,7 +1138,7 @@
     msgQ.type = eWNI_SME_AUTH_IND;
     msgQ.bodyptr = pSirSmeAuthInd;
     msgQ.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, msgQ.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, msgQ.type));
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT
     limDiagEventReport(pMac, WLAN_PE_DIAG_AUTH_IND_EVENT, NULL, 0, 0);
 #endif //FEATURE_WLAN_DIAG_SUPPORT
@@ -1274,7 +1274,8 @@
     }
     pSirSmeAssocInd->staId = pStaDs->staIndex;
    pSirSmeAssocInd->reassocReq = pStaDs->mlmStaContext.subType;
-    MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, msgQ.type));
+   MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, psessionEntry->peSessionId,
+                                                             msgQ.type));
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT
     limDiagEventReport(pMac, WLAN_PE_DIAG_ASSOC_IND_EVENT, psessionEntry, 0, 0);
 #endif //FEATURE_WLAN_DIAG_SUPPORT
diff --git a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
index f1cd362..81b112e 100644
--- a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
@@ -550,7 +550,8 @@
                         pSirSmeProbeReq->sessionId = psessionEntry->smeSessionId;
                         vos_mem_copy(pSirSmeProbeReq->peerMacAddr, pHdr->sa, sizeof(tSirMacAddr));
                         pSirSmeProbeReq->devicePasswdId = probeReq.probeReqWscIeInfo.DevicePasswordID.id;
-                        MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, msgQ.type));
+                        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG,
+                            psessionEntry->peSessionId, msgQ.type));
                        if (limSysProcessMmhMsgApi(pMac, &msgQ,  ePROT) != eSIR_SUCCESS){
                             PELOG3(limLog(pMac, LOG3, FL("couldnt send the probe req to wsm "));)
                         }
@@ -795,7 +796,8 @@
     vos_mem_copy(pSirSmeProbeReqInd->bssId, psessionEntry->bssId, sizeof(tSirMacAddr));
     vos_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.peerMacAddr, peerMacAddr, sizeof(tSirMacAddr));
 
-    MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, msgQ.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, psessionEntry->peSessionId,
+                                                               msgQ.type));
     pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIELen = (tANI_U16)ProbeReqIELen;
     vos_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIE, pProbeReqIE, ProbeReqIELen);
     
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 093eca3..9754107 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -3479,7 +3479,7 @@
     mmhMsg.bodyval = 0;
   
     pMac->lim.gLimRspReqd = false;
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg,  ePROT);
 }
 
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index 05ad181..d6eef57 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
@@ -116,7 +116,7 @@
     mmhMsg.type = msgType;
     mmhMsg.bodyptr = pSirSmeRsp;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, smesessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, smesessionId, mmhMsg.type));
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT 
    {
@@ -194,7 +194,7 @@
     mmhMsg.type = pSirSmeJoinRsp->messageType;
     mmhMsg.bodyptr = pSirSmeJoinRsp;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg,  ePROT);
 }
 
@@ -673,11 +673,12 @@
     mmhMsg.bodyval = 0;
     if(psessionEntry == NULL)
     {
-        MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     }
     else
     {
-        MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG,
+                  psessionEntry->peSessionId, mmhMsg.type));
     }
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT 
     limDiagEventReport(pMac, WLAN_PE_DIAG_START_BSS_RSP_EVENT, psessionEntry, (tANI_U16)resultCode, 0);
@@ -782,7 +783,8 @@
                 pSirSmeScanRsp->length      = curMsgLen;
                 mmhMsg.bodyptr = pSirSmeScanRsp;
                 mmhMsg.bodyval = 0;
-                MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+                MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION,
+                                                           mmhMsg.type));
                 limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
                 pSirSmeScanRsp = vos_mem_malloc(allocLength);
                 if ( NULL == pSirSmeScanRsp )
@@ -842,7 +844,6 @@
         mmhMsg.type = eWNI_SME_SCAN_RSP;
         mmhMsg.bodyptr = pSirSmeScanRsp;
         mmhMsg.bodyval = 0;
-        MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
         limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
         limLog(pMac, LOG1, FL("statusCode : eSIR_SME_SUCCESS"));
     }
@@ -944,7 +945,8 @@
                 pSirSmeScanRsp->length      = curMsgLen;
                 mmhMsg.bodyptr = pSirSmeScanRsp;
                 mmhMsg.bodyval = 0;
-                MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+                MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION,
+                                                         mmhMsg.type));
                 limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
                 pSirSmeScanRsp = vos_mem_malloc(allocLength);
                 if ( NULL == pSirSmeScanRsp )
@@ -1004,7 +1006,7 @@
         mmhMsg.type = eWNI_SME_SCAN_RSP;
         mmhMsg.bodyptr = pSirSmeScanRsp;
         mmhMsg.bodyval = 0;
-        MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
         limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
         PELOG2(limLog(pMac, LOG2, FL("statusCode : eSIR_SME_SUCCESS\n"));)
     }
@@ -1069,7 +1071,7 @@
     mmhMsg.bodyptr = pSirSmeScanRsp;
     mmhMsg.bodyval = 0;
 
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT 
     limDiagEventReport(pMac, WLAN_PE_DIAG_SCAN_RSP_EVENT, NULL, (tANI_U16)resultCode, 0);
 #endif //FEATURE_WLAN_DIAG_SUPPORT
@@ -1237,7 +1239,7 @@
     mmhMsg.bodyptr = pMsg;
     mmhMsg.bodyval = 0;
 
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
 
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 }
@@ -1452,7 +1454,8 @@
     mmhMsg.bodyptr = pSirSmeDisassocInd;
     mmhMsg.bodyval = 0;
 
-    MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, psessionEntry->peSessionId,
+                                                            mmhMsg.type));
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT 
     limDiagEventReport(pMac, WLAN_PE_DIAG_DISASSOC_IND_EVENT, psessionEntry, 0, (tANI_U16)pStaDs->mlmStaContext.disassocReason); 
 #endif //FEATURE_WLAN_DIAG_SUPPORT
@@ -1897,7 +1900,7 @@
     }
 
 
-    MTRACE(macTraceMsgTx(pMac, sessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, sessionId, mmhMsg.type));
     if (eSIR_SUCCESS != limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT))
     {
         vos_mem_free(pSirSmeWmStatusChangeNtf);
@@ -1973,11 +1976,13 @@
     mmhMsg.bodyval = 0;
     if(NULL == psessionEntry)
     {
-        MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+          MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION,
+                                                  mmhMsg.type));
     }
     else
     {
-        MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, mmhMsg.type));
+          MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG,
+                     psessionEntry->peSessionId, mmhMsg.type));
     }
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT 
@@ -2055,11 +2060,12 @@
     mmhMsg.bodyval = 0;
     if(NULL == psessionEntry)
     {
-        MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     }
     else
     {
-        MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG,
+                   psessionEntry->peSessionId, mmhMsg.type));
     }
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 } /*** end limSendSmeSetContextRsp() ***/
@@ -2195,7 +2201,7 @@
     msgQ.type = eWNI_SME_NEIGHBOR_BSS_IND;
     msgQ.bodyptr = pNewBssInd;
     msgQ.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, msgQ.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, msgQ.type));
     limSysProcessMmhMsgApi(pMac, &msgQ, ePROT);
 } /*** end limSendSmeNeighborBssInd() ***/
 
@@ -2241,11 +2247,12 @@
     mmhMsg.bodyval = 0;
     if(NULL == psessionEntry)
     {
-        MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     }
     else
     {
-        MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG,
+                 psessionEntry->peSessionId, mmhMsg.type));
     }
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT 
     limDiagEventReport(pMac, WLAN_PE_DIAG_ADDTS_RSP_EVENT, psessionEntry, 0, 0);
@@ -2330,11 +2337,12 @@
     mmhMsg.bodyval = 0;
     if(NULL == psessionEntry)
     {
-        MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     }
     else
     {
-        MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, mmhMsg.type));
+        MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG,
+                   psessionEntry->peSessionId, mmhMsg.type));
     }
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT 
     limDiagEventReport(pMac, WLAN_PE_DIAG_DELTS_RSP_EVENT, psessionEntry, (tANI_U16)status, 0);
@@ -2439,7 +2447,7 @@
 
     mmhMsg.bodyptr = stats;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);                                                  
 
     return;
@@ -2498,7 +2506,7 @@
 
     mmhMsg.bodyptr = stats;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);                                                  
 
     return;
@@ -2557,7 +2565,7 @@
 
     mmhMsg.bodyptr = stats;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, sessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, sessionId, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 
     return;
@@ -2614,7 +2622,7 @@
     mmhMsg.type = eWNI_SME_GET_TSM_STATS_RSP;
     mmhMsg.bodyptr = pStats;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, sessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, sessionId, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 
     return;
@@ -2665,7 +2673,7 @@
     mmhMsg.type    = msgType;
 //    mmhMsg.bodyval = (tANI_U32) pNewPeerInd;
     mmhMsg.bodyptr = pNewPeerInd;
-    MTRACE(macTraceMsgTx(pMac, sessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, sessionId, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
     
 }
@@ -2707,7 +2715,7 @@
     mmhMsg.bodyval = 0;
   
     limLog(pMac, LOG1, FL("Sending eWNI_PMC_EXIT_BMPS_IND to SME. "));
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT 
     limDiagEventReport(pMac, WLAN_PE_DIAG_EXIT_BMPS_IND_EVENT, peGetValidPowerSaveSession(pMac), 0, (tANI_U16)reasonCode);
 #endif //FEATURE_WLAN_DIAG_SUPPORT
@@ -2773,7 +2781,7 @@
     mmhMsg.type = eWNI_SME_FT_AGGR_QOS_RSP;
     mmhMsg.bodyptr = aggrQosRsp;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, smesessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, smesessionId, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 
     return;
@@ -2798,7 +2806,7 @@
     mmhMsg.type = eWNI_SME_PRE_SWITCH_CHL_IND;
     mmhMsg.bodyptr = NULL;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 
     return;
@@ -2822,7 +2830,7 @@
     mmhMsg.type = eWNI_SME_POST_SWITCH_CHL_IND;
     mmhMsg.bodyptr = NULL;
     mmhMsg.bodyval = 0;
-    MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 
     return;
@@ -2850,7 +2858,7 @@
     mmhMsg.bodyptr = pSmeMaxAssocInd;
     limLog(pMac, LOG1, FL("msgType %s peerMacAddr "MAC_ADDRESS_STR
                   " sme session id %d"), "eWNI_SME_MAX_ASSOC_EXCEEDED", MAC_ADDR_ARRAY(peerMacAddr),smesessionId);
-    MTRACE(macTraceMsgTx(pMac, smesessionId, mmhMsg.type));
+    MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, smesessionId, mmhMsg.type));
     limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 
     return;
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index 5ccaae6..b7ed07e 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -408,6 +408,11 @@
         CASE_RETURN_STRING( eLIM_MLM_WT_REMOVE_BSS_KEY_STATE);
         CASE_RETURN_STRING( eLIM_MLM_WT_REMOVE_STA_KEY_STATE);
         CASE_RETURN_STRING( eLIM_MLM_WT_SET_MIMOPS_STATE);
+#if defined WLAN_FEATURE_VOWIFI_11R
+        CASE_RETURN_STRING(eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE);
+        CASE_RETURN_STRING(eLIM_MLM_WT_FT_REASSOC_RSP_STATE);
+#endif
+        CASE_RETURN_STRING(eLIM_MLM_P2P_LISTEN_STATE);
         default:
             return( "UNKNOWN" );
             break;
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index c641240..6fb0a00 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -3305,8 +3305,8 @@
    mmhMsg.bodyptr = pSirSmeSwitchChInd;
    mmhMsg.bodyval = 0;
    
-   MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, mmhMsg.type));
-   
+   MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, psessionEntry->peSessionId,
+                                                            mmhMsg.type));
    SysProcessMmhMsg(pMac, &mmhMsg);
 }
 
@@ -7486,7 +7486,7 @@
    mmhMsg.type = eWNI_SME_ADD_STA_SELF_RSP;
    mmhMsg.bodyptr = pRsp;
    mmhMsg.bodyval = 0;
-   MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+   MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
    limSysProcessMmhMsgApi(pMac, &mmhMsg,  ePROT);
 
 }
@@ -7525,7 +7525,7 @@
    mmhMsg.type = eWNI_SME_DEL_STA_SELF_RSP;
    mmhMsg.bodyptr = pRsp;
    mmhMsg.bodyval = 0;
-   MTRACE(macTraceMsgTx(pMac, NO_SESSION, mmhMsg.type));
+   MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, NO_SESSION, mmhMsg.type));
    limSysProcessMmhMsgApi(pMac, &mmhMsg,  ePROT);
 
 }
diff --git a/CORE/MAC/src/pe/rrm/rrmApi.c b/CORE/MAC/src/pe/rrm/rrmApi.c
index 66c18e5..d094864 100644
--- a/CORE/MAC/src/pe/rrm/rrmApi.c
+++ b/CORE/MAC/src/pe/rrm/rrmApi.c
@@ -450,7 +450,8 @@
    //Send request to SME.
    mmhMsg.type    = pSmeNeighborRpt->messageType;
    mmhMsg.bodyptr = pSmeNeighborRpt;
-   MTRACE(macTraceMsgTx(pMac, pSessionEntry->peSessionId, mmhMsg.type));
+   MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, pSessionEntry->peSessionId,
+                                                           mmhMsg.type));
    status = limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 
    return status;
@@ -669,7 +670,8 @@
    //Send request to SME.
    mmhMsg.type    = eWNI_SME_BEACON_REPORT_REQ_IND;
    mmhMsg.bodyptr = pSmeBcnReportReq;
-   MTRACE(macTraceMsgTx(pMac, pSessionEntry->peSessionId, mmhMsg.type));
+   MTRACE(macTrace(pMac, TRACE_CODE_TX_SME_MSG, pSessionEntry->peSessionId,
+                                                           mmhMsg.type));
    return limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
 }
 
diff --git a/CORE/SME/src/sme_common/sme_Trace.c b/CORE/SME/src/sme_common/sme_Trace.c
index 481181f..3542354 100644
--- a/CORE/SME/src/sme_common/sme_Trace.c
+++ b/CORE/SME/src/sme_common/sme_Trace.c
@@ -147,7 +147,14 @@
 #ifdef FEATURE_WLAN_LPHB
         CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ);
 #endif /* FEATURE_WLAN_LPHB */
-
+        CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_EXTSCAN_GET_CAPABILITIES);
+        CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_EXTSCAN_START);
+        CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_EXTSCAN_STOP);
+        CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_EXTSCAN_SET_BSS_HOTLIST);
+        CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_EXTSCAN_RESET_BSS_HOTLIST);
+        CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_EXTSCAN_SET_SIGNF_CHANGE);
+        CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_EXTSCAN_RESET_SIGNF_CHANGE);
+        CASE_RETURN_STRING(TRACE_CODE_SME_RX_HDD_EXTSCAN_GET_CACHED_RESULTS);
         default:
             return( "UNKNOWN" );
             break;
@@ -167,6 +174,17 @@
         CASE_RETURN_STRING(eSmeCommandRemoveKey);
         CASE_RETURN_STRING(eSmeCommandAddStaSession);
         CASE_RETURN_STRING(eSmeCommandDelStaSession);
+        CASE_RETURN_STRING(eSmeCommandPnoReq);
+        CASE_RETURN_STRING(eSmeCommandMacSpoofRequest);
+        CASE_RETURN_STRING(eSmeCommandGetFrameLogRequest);
+#ifdef FEATURE_WLAN_TDLS
+        CASE_RETURN_STRING(eSmeCommandTdlsSendMgmt);
+        CASE_RETURN_STRING(eSmeCommandTdlsAddPeer);
+        CASE_RETURN_STRING(eSmeCommandTdlsDelPeer);
+        CASE_RETURN_STRING(eSmeCommandTdlsLinkEstablish);
+        CASE_RETURN_STRING(eSmeCommandTdlsChannelSwitch);
+#endif
+        CASE_RETURN_STRING(eSmeCommandNanReq);
         CASE_RETURN_STRING(eSmePmcCommandMask);
         CASE_RETURN_STRING(eSmeCommandEnterImps);
         CASE_RETURN_STRING(eSmeCommandExitImps);
diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c
index 8245bd3..27e9a63 100644
--- a/CORE/SYS/legacy/src/utils/src/macTrace.c
+++ b/CORE/SYS/legacy/src/utils/src/macTrace.c
@@ -52,7 +52,9 @@
 #include "csrNeighborRoam.h"
 #include "csrInternal.h"
 #include "limGlobal.h"
+#include "limTypes.h"
 #include "wlan_qct_tl.h"
+#include "wlan_qct_wda.h"
 #include "vos_trace.h"
 
 #ifdef TRACE_RECORD
@@ -430,6 +432,7 @@
         CASE_RETURN_STRING(eWNI_SME_SET_APWPARSNIEs_REQ);
         CASE_RETURN_STRING(eWNI_SME_UPPER_LAYER_ASSOC_CNF);
         CASE_RETURN_STRING(eWNI_SME_HIDE_SSID_REQ);
+        CASE_RETURN_STRING(eWNI_SME_CHNG_MCC_BEACON_INTERVAL);
         CASE_RETURN_STRING(eWNI_SME_REMAIN_ON_CHANNEL_REQ);
         CASE_RETURN_STRING(eWNI_SME_REMAIN_ON_CHN_IND);
         CASE_RETURN_STRING(eWNI_SME_REMAIN_ON_CHN_RSP);
@@ -525,15 +528,45 @@
 #endif // WLAN_WAKEUP_EVENTS
         CASE_RETURN_STRING(eWNI_SME_EXCLUDE_UNENCRYPTED);
         CASE_RETURN_STRING(eWNI_SME_RSSI_IND); //RSSI indication from TL to be serialized on MC thread
-        CASE_RETURN_STRING(eWNI_SME_MSG_TYPES_END);
+#ifdef FEATURE_WLAN_TDLS
+        CASE_RETURN_STRING(eWNI_SME_TDLS_SEND_MGMT_REQ);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_SEND_MGMT_RSP);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_ADD_STA_REQ);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_ADD_STA_RSP);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_DEL_STA_REQ);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_DEL_STA_RSP);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_DEL_STA_IND);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_DEL_ALL_PEER_IND);
+        CASE_RETURN_STRING(eWNI_SME_MGMT_FRM_TX_COMPLETION_IND);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_LINK_ESTABLISH_REQ);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_LINK_ESTABLISH_RSP);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_CHANNEL_SWITCH_REQ);
+        CASE_RETURN_STRING(eWNI_SME_TDLS_CHANNEL_SWITCH_RSP);
+#endif
+        CASE_RETURN_STRING(eWNI_SME_SET_BCN_FILTER_REQ);
+        CASE_RETURN_STRING(eWNI_SME_RESET_AP_CAPS_CHANGED);
+#ifdef WLAN_FEATURE_11W
+        CASE_RETURN_STRING(eWNI_SME_UNPROT_MGMT_FRM_IND);
+#endif
+        CASE_RETURN_STRING(eWNI_SME_CANDIDATE_FOUND_IND);
+        CASE_RETURN_STRING(eWNI_SME_HANDOFF_REQ);
         CASE_RETURN_STRING(eWNI_SME_GET_ROAM_RSSI_REQ);
         CASE_RETURN_STRING(eWNI_SME_GET_ROAM_RSSI_RSP);
         CASE_RETURN_STRING(eWNI_SME_GET_TSM_STATS_REQ);
         CASE_RETURN_STRING(eWNI_SME_GET_TSM_STATS_RSP);
+        CASE_RETURN_STRING(eWNI_SME_TSM_IE_IND);
         CASE_RETURN_STRING(eWNI_SME_HT40_OBSS_SCAN_IND);
         CASE_RETURN_STRING(eWNI_SME_HT40_STOP_OBSS_SCAN_IND);
         CASE_RETURN_STRING(eWNI_SME_NAN_EVENT);
         CASE_RETURN_STRING(eWNI_SME_ENCRYPT_MSG_RSP);
+#ifdef WLAN_FEATURE_AP_HT40_24G
+        CASE_RETURN_STRING(eWNI_SME_SET_HT_2040_MODE);
+        CASE_RETURN_STRING(eWNI_SME_2040_COEX_IND);
+#endif
+        CASE_RETURN_STRING(eWNI_SME_MAC_SPOOF_ADDR_IND);
+        CASE_RETURN_STRING(eWNI_SME_UPDATE_MAX_RATE_IND);
+        CASE_RETURN_STRING(eWNI_SME_SET_TDLS_2040_BSSCOEX_REQ);
+        CASE_RETURN_STRING(eWNI_SME_MSG_TYPES_END);
         default:
             return( (tANI_U8*)"UNKNOWN" );
             break;
@@ -681,6 +714,9 @@
         CASE_RETURN_STRING(WDA_TIMER_CHIP_MONITOR_TIMEOUT);
         CASE_RETURN_STRING(WDA_TIMER_TRAFFIC_ACTIVITY_REQ);
         CASE_RETURN_STRING(WDA_TIMER_ADC_RSSI_STATS);
+#ifdef WLAN_FEATURE_11W
+        CASE_RETURN_STRING(WDA_EXCLUDE_UNENCRYPTED_IND);
+#endif
 #ifdef FEATURE_WLAN_ESE
         CASE_RETURN_STRING(WDA_TSM_STATS_REQ);
         CASE_RETURN_STRING(WDA_TSM_STATS_RSP);
@@ -731,6 +767,7 @@
 #endif //SUPPORT_BEACON_FILTER
         CASE_RETURN_STRING(WDA_SET_MAX_TX_POWER_REQ);
         CASE_RETURN_STRING(WDA_SET_MAX_TX_POWER_RSP);
+        CASE_RETURN_STRING(WDA_SET_MAX_TX_POWER_PER_BAND_RSP);
         CASE_RETURN_STRING(WDA_SET_MAX_TX_POWER_PER_BAND_REQ);
         CASE_RETURN_STRING(WDA_SEND_MSG_COMPLETE);
         CASE_RETURN_STRING(WDA_SET_HOST_OFFLOAD);
@@ -741,6 +778,8 @@
         CASE_RETURN_STRING(WDA_ADD_STA_SELF_REQ);
         CASE_RETURN_STRING(WDA_DEL_STA_SELF_REQ);
         CASE_RETURN_STRING(WDA_SET_P2P_GO_NOA_REQ);
+        CASE_RETURN_STRING(WDA_SET_TDLS_LINK_ESTABLISH_REQ);
+        CASE_RETURN_STRING(WDA_SET_TDLS_LINK_ESTABLISH_REQ_RSP);
         CASE_RETURN_STRING(WDA_TX_COMPLETE_TIMEOUT_IND);
         CASE_RETURN_STRING(WDA_TIMER_TRAFFIC_STATS_IND);
         CASE_RETURN_STRING(WDA_WLAN_SUSPEND_IND);
@@ -763,6 +802,7 @@
 #endif // FEATURE_WLAN_SCAN_PNO
 #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
         CASE_RETURN_STRING(WDA_ROAM_SCAN_OFFLOAD_REQ);
+        CASE_RETURN_STRING(WDA_ROAM_SCAN_OFFLOAD_RSP);
 #endif
 #ifdef WLAN_WAKEUP_EVENTS
         CASE_RETURN_STRING(WDA_WAKE_REASON_IND);
@@ -784,8 +824,22 @@
 #ifdef WLAN_FEATURE_11AC
         CASE_RETURN_STRING(WDA_UPDATE_OP_MODE);
 #endif
+        CASE_RETURN_STRING(WDA_GET_ROAM_RSSI_REQ);
+        CASE_RETURN_STRING(WDA_GET_ROAM_RSSI_RSP);
+        CASE_RETURN_STRING(WDA_NAN_REQUEST);
+        CASE_RETURN_STRING(WDA_START_SCAN_OFFLOAD_REQ);
+        CASE_RETURN_STRING(WDA_START_SCAN_OFFLOAD_RSP);
+        CASE_RETURN_STRING(WDA_STOP_SCAN_OFFLOAD_REQ);
+        CASE_RETURN_STRING(WDA_STOP_SCAN_OFFLOAD_RSP);
+        CASE_RETURN_STRING(WDA_UPDATE_CHAN_LIST_RSP);
+        CASE_RETURN_STRING(WDA_RX_SCAN_EVENT);
+        CASE_RETURN_STRING(WDA_IBSS_PEER_INACTIVITY_IND);
+#ifdef FEATURE_WLAN_LPHB
+        CASE_RETURN_STRING(WDA_LPHB_WAIT_EXPIRE_IND);
+#endif
 #ifdef FEATURE_WLAN_BATCH_SCAN
         CASE_RETURN_STRING(WDA_SET_BATCH_SCAN_REQ);
+        CASE_RETURN_STRING(WDA_SET_BATCH_SCAN_RSP);
         CASE_RETURN_STRING(WDA_STOP_BATCH_SCAN_IND);
         CASE_RETURN_STRING(WDA_TRIGGER_BATCH_SCAN_RESULT_IND);
 #endif
@@ -815,6 +869,22 @@
         CASE_RETURN_STRING(WDA_EXTSCAN_RESET_SIGNF_RSSI_CHANGE_REQ);
         CASE_RETURN_STRING(WDA_EXTSCAN_GET_CACHED_RESULTS_REQ);
 #endif /* WLAN_FEATURE_EXTSCAN */
+        CASE_RETURN_STRING(WDA_HT40_OBSS_SCAN_IND);
+        CASE_RETURN_STRING(WDA_HT40_OBSS_STOP_SCAN_IND);
+        CASE_RETURN_STRING(WDA_ENCRYPT_MSG_REQ);
+        CASE_RETURN_STRING(WDA_ENCRYPT_MSG_RSP);
+#ifdef WLAN_FEATURE_LINK_LAYER_STATS
+        CASE_RETURN_STRING(WDA_LINK_LAYER_STATS_RESULTS_RSP);
+#endif
+#ifdef FEATURE_WLAN_TDLS
+        CASE_RETURN_STRING(WDA_SET_TDLS_CHAN_SWITCH_REQ);
+        CASE_RETURN_STRING(WDA_SET_TDLS_CHAN_SWITCH_REQ_RSP);
+#endif
+        CASE_RETURN_STRING(WDA_FW_STATS_GET_REQ);
+        CASE_RETURN_STRING(WDA_SET_RTS_CTS_HTVHT);
+        CASE_RETURN_STRING(WDA_MON_START_REQ);
+        CASE_RETURN_STRING(WDA_MON_STOP_REQ);
+        CASE_RETURN_STRING(WDA_SPOOF_MAC_ADDR_REQ);
         default:
             return((tANI_U8*) "UNKNOWN" );
             break;
@@ -878,6 +948,43 @@
         CASE_RETURN_STRING(SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT);
         CASE_RETURN_STRING(SIR_LIM_AUTH_RETRY_TIMEOUT);
         CASE_RETURN_STRING(SIR_LIM_MSG_TYPES_END);
+        CASE_RETURN_STRING(LIM_MLM_SCAN_REQ);
+        CASE_RETURN_STRING(LIM_MLM_SCAN_CNF);
+        CASE_RETURN_STRING(LIM_MLM_START_REQ);
+        CASE_RETURN_STRING(LIM_MLM_START_CNF);
+        CASE_RETURN_STRING(LIM_MLM_JOIN_REQ);
+        CASE_RETURN_STRING(LIM_MLM_JOIN_CNF);
+        CASE_RETURN_STRING(LIM_MLM_AUTH_REQ);
+        CASE_RETURN_STRING(LIM_MLM_AUTH_CNF);
+        CASE_RETURN_STRING(LIM_MLM_AUTH_IND);
+        CASE_RETURN_STRING(LIM_MLM_ASSOC_REQ);
+        CASE_RETURN_STRING(LIM_MLM_ASSOC_CNF);
+        CASE_RETURN_STRING(LIM_MLM_ASSOC_IND);
+        CASE_RETURN_STRING(LIM_MLM_DISASSOC_REQ);
+        CASE_RETURN_STRING(LIM_MLM_DISASSOC_CNF);
+        CASE_RETURN_STRING(LIM_MLM_DISASSOC_IND);
+        CASE_RETURN_STRING(LIM_MLM_REASSOC_REQ);
+        CASE_RETURN_STRING(LIM_MLM_REASSOC_CNF);
+        CASE_RETURN_STRING(LIM_MLM_REASSOC_IND);
+        CASE_RETURN_STRING(LIM_MLM_DEAUTH_REQ);
+        CASE_RETURN_STRING(LIM_MLM_DEAUTH_CNF);
+        CASE_RETURN_STRING(LIM_MLM_DEAUTH_IND);
+        CASE_RETURN_STRING(LIM_MLM_TSPEC_REQ);
+        CASE_RETURN_STRING(LIM_MLM_TSPEC_CNF);
+        CASE_RETURN_STRING(LIM_MLM_SETKEYS_REQ);
+        CASE_RETURN_STRING(LIM_MLM_SETKEYS_CNF);
+        CASE_RETURN_STRING(LIM_MLM_PURGE_STA_IND);
+        CASE_RETURN_STRING(LIM_MLM_ADDBA_REQ);
+        CASE_RETURN_STRING(LIM_MLM_ADDBA_CNF);
+        CASE_RETURN_STRING(LIM_MLM_ADDBA_RSP);
+        CASE_RETURN_STRING(LIM_MLM_DELBA_REQ);
+        CASE_RETURN_STRING(LIM_MLM_DELBA_CNF);
+        CASE_RETURN_STRING(LIM_MLM_REMOVEKEY_REQ);
+        CASE_RETURN_STRING(LIM_MLM_REMOVEKEY_CNF);
+#ifdef FEATURE_OEM_DATA_SUPPORT
+        CASE_RETURN_STRING(LIM_MLM_OEM_DATA_REQ);
+        CASE_RETURN_STRING(LIM_MLM_OEM_DATA_CNF);
+#endif
         default:
             return( (tANI_U8*)"UNKNOWN" );
             break;
@@ -895,7 +1002,9 @@
         CASE_RETURN_STRING(WNI_CFG_SET_CNF);
         CASE_RETURN_STRING(SIR_CFG_PARAM_UPDATE_IND);
         CASE_RETURN_STRING(SIR_CFG_DOWNLOAD_COMPLETE_IND);
-
+        CASE_RETURN_STRING(WNI_CFG_DNLD_RSP);
+        CASE_RETURN_STRING(WNI_CFG_GET_REQ);
+        CASE_RETURN_STRING(WNI_CFG_SET_REQ);
         CASE_RETURN_STRING(WNI_CFG_SET_REQ_NO_RSP);
         default:
             return( (tANI_U8*)"UNKNOWN" );
diff --git a/CORE/TL/src/wlan_qct_tl_trace.c b/CORE/TL/src/wlan_qct_tl_trace.c
index 8241670..3a3e2f3 100644
--- a/CORE/TL/src/wlan_qct_tl_trace.c
+++ b/CORE/TL/src/wlan_qct_tl_trace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -52,6 +52,10 @@
          CASE_RETURN_STRING(TRACE_CODE_TL_QUEUE_CURRENT);
          CASE_RETURN_STRING(TRACE_CODE_TL_REORDER_TIMER_EXP_CB);
          CASE_RETURN_STRING(TRACE_CODE_TL_BA_SESSION_DEL);
+         CASE_RETURN_STRING(TRACE_CODE_TL_ASSOC_FAILED);
+         CASE_RETURN_STRING(TRACE_CODE_TL_FORWARD_CACHED_FRAMES);
+         CASE_RETURN_STRING(TRACE_CODE_TL_FLUSH_CACHED_FRAMES);
+         CASE_RETURN_STRING(TRACE_CODE_TL_CACHE_FRAME);
          default:
                return ("UNKNOWN");
                break;