From 075431a9f8965dcde5ea65f8027db423546ad9d4 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Thu, 16 Mar 2017 15:23:30 +0530 Subject: [PATCH 1/2] qcacld-3.0: Remove redundant MTRACE logs This change includes to remove redundant MRACE logs which are seen very frequent in MTRACE dumps and remove multiple definition of WMA_SET_TX_POWER_REQ. Change-Id: Ic5ac780ba3d31a8f2c6e4c10f7af5051864e7f3e CRs-Fixed: 2020491 --- core/hdd/src/wlan_hdd_assoc.c | 6 ++++-- core/mac/src/pe/lim/lim_process_message_queue.c | 8 +++++--- core/sme/src/common/sme_api.c | 2 -- core/wma/inc/wma_types.h | 1 - 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 25ea28d40e62..c679605bdd30 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -4727,8 +4727,10 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG, - pAdapter->sessionId, roamStatus)); + /* Omitting eCSR_ROAM_UPDATE_SCAN_RESULT as this is too frequent */ + if (eCSR_ROAM_UPDATE_SCAN_RESULT != roamStatus) + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG, + pAdapter->sessionId, roamStatus)); switch (roamStatus) { case eCSR_ROAM_SESSION_OPENED: diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index e467268bdf78..11e0c9c98a4e 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1312,8 +1312,9 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, * SME enums (eWNI_SME_START_REQ) starts with 0x16xx. * Compare received SME events with SIR_SME_MODULE_ID */ - if (SIR_SME_MODULE_ID == - (uint8_t)MAC_TRACE_GET_MODULE_ID(msg->type)) { + if ((SIR_SME_MODULE_ID == + (uint8_t)MAC_TRACE_GET_MODULE_ID(msg->type)) && + (msg->type != eWNI_SME_REGISTER_MGMT_FRAME_REQ)) { MTRACE(mac_trace(mac_ctx, TRACE_CODE_RX_SME_MSG, NO_SESSION, msg->type)); } else { @@ -1323,7 +1324,8 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, * if these are also logged */ if (msg->type != SIR_CFG_PARAM_UPDATE_IND && - msg->type != SIR_BB_XPORT_MGMT_MSG) + msg->type != SIR_BB_XPORT_MGMT_MSG && + msg->type != WMA_RX_SCAN_EVENT) MTRACE(mac_trace_msg_rx(mac_ctx, NO_SESSION, LIM_TRACE_MAKE_RXMSG(msg->type, LIM_MSG_PROCESSED));) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 6840a776d640..0c7fcc1ed13c 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -6209,8 +6209,6 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(qdf_trace(QDF_MODULE_ID_SME, - TRACE_CODE_SME_RX_HDD_REGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { tSirRegisterMgmtFrame *pMsg; diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 9a887f9d0502..67c4997107d4 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -237,7 +237,6 @@ #define WMA_SET_MAX_TX_POWER_REQ SIR_HAL_SET_MAX_TX_POWER_REQ #define WMA_SET_MAX_TX_POWER_RSP SIR_HAL_SET_MAX_TX_POWER_RSP -#define WMA_SET_TX_POWER_REQ SIR_HAL_SET_TX_POWER_REQ #define WMA_SET_DTIM_PERIOD SIR_HAL_SET_DTIM_PERIOD #define WMA_SET_MAX_TX_POWER_PER_BAND_REQ \ From f0ee944b3e391d0b00aa1a6f65a0ea109933b7f3 Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Tue, 21 Mar 2017 16:15:12 -0700 Subject: [PATCH 2/2] Release 5.2.0.16O Release 5.2.0.16O Change-Id: I3267c47231b14b7d57c03318963feb95b934edf3 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 0b04c258835e..84ab749b3626 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 2 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "N" +#define QWLAN_VERSION_EXTRA "O" #define QWLAN_VERSION_BUILD 16 -#define QWLAN_VERSIONSTR "5.2.0.16N" +#define QWLAN_VERSIONSTR "5.2.0.16O" #endif /* QWLAN_VERSION_H */