From f23c714cf3fc418806d6d2d35658aac68548beac Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 27 Nov 2017 10:46:59 -0800 Subject: [PATCH] qcacmn: Rename enum tQDF_GLOBAL_CON_MODE The name tQDF_GLOBAL_CON_MODE is a poor name on many levels: - The "t" prefix implies it is a typedef when it isn't. - The "t" prefix makes this a mixed-case identifier which is "frowned upon" in the Linux coding style guide. - The term "CON_MODE" is MCL-specific and is not suitable for converged code. Therefore rename enum tQDF_GLOBAL_CON_MODE to enum QDF_GLOBAL_MODE to better align with with the Linix coding style and the converged nomenclature. Change-Id: I57933a62f6ce02b6594d97198be8132e61e8d1f6 CRs-Fixed: 2152503 --- qdf/inc/qdf_types.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h index 89853c18551c..6dd60d65cdd2 100644 --- a/qdf/inc/qdf_types.h +++ b/qdf/inc/qdf_types.h @@ -494,12 +494,11 @@ enum QDF_OPMODE { QDF_MAX_NO_OF_MODE }; -/* for backward compatability with the legacy definition */ +/* for backward compatibility with the legacy definition */ #define tQDF_ADAPTER_MODE QDF_OPMODE /** - * enum tQDF_GLOBAL_CON_MODE - global config mode when - * driver is loaded. + * enum QDF_GLOBAL_MODE - global mode when driver is loaded. * * @QDF_GLOBAL_MISSION_MODE: mission mode (STA, SAP...) * @QDF_GLOBAL_MONITOR_MODE: Monitor Mode @@ -509,7 +508,7 @@ enum QDF_OPMODE { * @QDF_GLOBAL_QVIT_MODE: QVIT global mode * @QDF_GLOBAL_MAX_MODE: Max place holder */ -enum tQDF_GLOBAL_CON_MODE { +enum QDF_GLOBAL_MODE { QDF_GLOBAL_MISSION_MODE, QDF_GLOBAL_MONITOR_MODE = 4, QDF_GLOBAL_FTM_MODE = 5, @@ -520,6 +519,9 @@ enum tQDF_GLOBAL_CON_MODE { QDF_GLOBAL_MAX_MODE }; +/* for backward compatibility with the legacy definition */ +#define tQDF_GLOBAL_CON_MODE QDF_GLOBAL_MODE + #define QDF_IS_EPPING_ENABLED(mode) (mode == QDF_GLOBAL_EPPING_MODE)