From 8dfe91af5f999c70ff1a6eb4175aeaed0325761d Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Fri, 26 Feb 2016 16:49:15 +0530 Subject: [PATCH] qcacld-3.0: Fix to move newly added enums to the bottom of the list qcacld-2.0 to qcacld-3.0 propagation Change-id Iac45ffc1736eecc40e203174888e296767b50a0d and Iced4b80de60f9640cad0342afac57f9a17c2a3e2 added new entries in between the existing enum list. Due to this stability scripts decodes them incorrectly. To fix this, move new entries to the bottom of the enum list. Change-Id: If0b759f58dd6831fad45ac3d321989a550fef405 CRs-Fixed: 954222 (cherry picked from commit 1f7fcef8e5190d0a1f75185bf874a4c1b36db26f) --- core/hdd/inc/wlan_hdd_trace.h | 12 ++++++++---- core/sme/inc/sme_trace.h | 29 +++++++++-------------------- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_trace.h b/core/hdd/inc/wlan_hdd_trace.h index 0703b2e8847e..b35fea3e44b3 100644 --- a/core/hdd/inc/wlan_hdd_trace.h +++ b/core/hdd/inc/wlan_hdd_trace.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -81,8 +81,6 @@ ENUM(TRACE_CODE_HDD_CHANGE_STATION) \ ENUM(TRACE_CODE_HDD_CFG80211_UPDATE_BSS) \ ENUM(TRACE_CODE_HDD_CFG80211_SCAN) \ - ENUM(TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START) \ - ENUM(TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP) \ ENUM(TRACE_CODE_HDD_REMAIN_ON_CHANNEL) \ ENUM(TRACE_CODE_HDD_REMAINCHANREADYHANDLER) \ ENUM(TRACE_CODE_HDD_CFG80211_CANCEL_REMAIN_ON_CHANNEL) \ @@ -93,7 +91,6 @@ ENUM(TRACE_CODE_HDD_CFG80211_DEL_STA) \ ENUM(TRACE_CODE_HDD_CFG80211_ADD_STA) \ ENUM(TRACE_CODE_HDD_CFG80211_SET_PMKSA) \ - ENUM(TRACE_CODE_HDD_CFG80211_DEL_PMKSA) \ ENUM(TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES) \ ENUM(TRACE_CODE_HDD_CFG80211_TDLS_MGMT) \ ENUM(TRACE_CODE_HDD_CFG80211_TDLS_OPER) \ @@ -109,6 +106,13 @@ ENUM(TRACE_CODE_HDD_CFG80211_SET_MAC_ACL) \ ENUM(TRACE_CODE_HDD_CFG80211_TESTMODE) \ ENUM(TRACE_CODE_HDD_CFG80211_DUMP_SURVEY) \ + ENUM(TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START) \ + ENUM(TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP) \ + ENUM(TRACE_CODE_HDD_CFG80211_DEL_PMKSA) \ + /* + * New CFG80211 enums to be added before this comment. + * TRACE_CODE_HDD_RX_SME_MSG is used as code for MTRACE commands. + */ \ ENUM(TRACE_CODE_HDD_RX_SME_MSG) enum { diff --git a/core/sme/inc/sme_trace.h b/core/sme/inc/sme_trace.h index 0f6f46a0ec9a..61ea3d2d4c6c 100644 --- a/core/sme/inc/sme_trace.h +++ b/core/sme/inc/sme_trace.h @@ -37,26 +37,8 @@ #include "mac_trace.h" #define NO_SESSION 0xFF -/** - * enum sme_trace_code - * - * SME commands for MTRACE logs - * - * @TRACE_CODE_SME_COMMAND: sme commands - * @TRACE_CODE_SME_TX_WMA_MSG: commands tx to WDA - * @TRACE_CODE_SME_RX_WMA_MSG: commands rx from WDA - */ -enum sme_trace_code { - TRACE_CODE_SME_COMMAND, - TRACE_CODE_SME_TX_WMA_MSG, - TRACE_CODE_SME_RX_WMA_MSG, -}; enum { - /* - * Starts enums from 3 onwards, because unknown code captures for first - * three enums in smeTraceDump() - */ - TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ = 3, + TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ, TRACE_CODE_SME_RX_HDD_MSG_SCAN_GET_RESULTS, TRACE_CODE_SME_RX_HDD_MSG_CONNECT, TRACE_CODE_SME_RX_HDD_MSG_SET_11DINFO, @@ -75,7 +57,6 @@ enum { TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, TRACE_CODE_SME_RX_HDD_ROAM_FREE_CONNECTPROFILE, TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, - TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, @@ -162,6 +143,14 @@ enum { #ifdef FEATURE_WLAN_LPHB TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ, #endif /* FEATURE_WLAN_LPHB */ + TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, + /* + * New trace commands to be added before this comment not at the end + * Trace codes for SME commands + */ + TRACE_CODE_SME_COMMAND = 250, + TRACE_CODE_SME_TX_WMA_MSG, + TRACE_CODE_SME_RX_WMA_MSG, }; void sme_trace_init(tpAniSirGlobal pMac);