From eec5a3331ea3d1a9109cb5bc9ac05c0d46819d4c Mon Sep 17 00:00:00 2001 From: Vignesh Viswanathan Date: Fri, 13 Jul 2018 12:48:14 +0530 Subject: [PATCH] qcacmn: Fix cfg_in_range macro for different CFG Types Due to some inconsistency in defining definition of cfg_##mtype##_in_range and the mtype of the CFG_INI_xxx definitions, usage of cfg_in_range was causing compilation issues. Fix the cfg_in_range related macros with correct mtypes Change-Id: I239a5f8735e5f2d7807b4947e36a655f58f26210 CRs-Fixed: 2278335 --- cfg/inc/cfg_ucfg_api.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg/inc/cfg_ucfg_api.h b/cfg/inc/cfg_ucfg_api.h index 11e4dc5784ae..1128041e6067 100644 --- a/cfg/inc/cfg_ucfg_api.h +++ b/cfg/inc/cfg_ucfg_api.h @@ -210,9 +210,9 @@ cfg_string_in_range(const char *value, qdf_size_t min_len, qdf_size_t max_len) return len >= min_len && len <= max_len; } -#define __cfg_int_in_range(value, min, max) (value >= min && value <= max) -#define __cfg_uint_in_range(value, min, max) (value >= min && value <= max) -#define __cfg_string_in_range(value, min_len, max_len) \ +#define __cfg_INT_in_range(value, min, max) (value >= min && value <= max) +#define __cfg_UINT_in_range(value, min, max) (value >= min && value <= max) +#define __cfg_STRING_in_range(value, min_len, max_len) \ cfg_string_in_range(value, min_len, max_len) #define __cfg_in_range(id, value, mtype) \ @@ -220,7 +220,7 @@ cfg_string_in_range(const char *value, qdf_size_t min_len, qdf_size_t max_len) /* this may look redundant, but forces @mtype to be expanded */ #define __cfg_in_range_type(id, value, mtype) \ - __cfg_is_range(id, value, mtype) + __cfg_in_range(id, value, mtype) #define cfg_in_range(id, value) __cfg_in_range_type(id, value, cfg_mtype(id))