From eda9c1ea69782cd90338fcbb76b51dbe0cab2e10 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Tue, 4 Apr 2017 17:43:59 -0700 Subject: [PATCH] qcacld-3.0: Use bitwise instead of logical operator for these constants Several constants in rrm_global.h use logical || where a bitwise | was probably intended. clang warns about this. Hence, use bitwise operator instead of logical operator. Change-Id: I5a0543096e7f213f3d60f3eda03eb7765595a364 CRs-Fixed: 2028989 --- core/mac/src/pe/include/rrm_global.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/mac/src/pe/include/rrm_global.h b/core/mac/src/pe/include/rrm_global.h index 6d829fffa999..d8afcfa50e7f 100644 --- a/core/mac/src/pe/include/rrm_global.h +++ b/core/mac/src/pe/include/rrm_global.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -296,12 +296,12 @@ enum mask_rm_capability_byte3 { RM_CAP_NONOPER_CHAN_MAX_DURATION_1 = (1 << (5)), RM_CAP_NONOPER_CHAN_MAX_DURATION_2 = (1 << (6)), RM_CAP_NONOPER_CHAN_MAX_DURATION_3 = (1 << (7)), - RM_CAP_OPER_CHAN_MAX_DURATION = (RM_CAP_OPER_CHAN_MAX_DURATION_1 || - RM_CAP_OPER_CHAN_MAX_DURATION_2 || + RM_CAP_OPER_CHAN_MAX_DURATION = (RM_CAP_OPER_CHAN_MAX_DURATION_1 | + RM_CAP_OPER_CHAN_MAX_DURATION_2 | RM_CAP_OPER_CHAN_MAX_DURATION_3), RM_CAP_NONOPER_CHAN_MAX_DURATION = - (RM_CAP_NONOPER_CHAN_MAX_DURATION_1 || - RM_CAP_NONOPER_CHAN_MAX_DURATION_2 || + (RM_CAP_NONOPER_CHAN_MAX_DURATION_1 | + RM_CAP_NONOPER_CHAN_MAX_DURATION_2 | RM_CAP_NONOPER_CHAN_MAX_DURATION_3), }; @@ -327,8 +327,8 @@ enum mask_rm_capability_byte4 { RM_CAP_RCPI_MEASUREMENT1 = (1 << (5)), RM_CAP_RSNI_MEASUREMENT = (1 << (6)), RM_CAP_BSS_AVG_ACCESS_DELAY = (1 << (7)), - RM_CAP_MEASUREMENT_PILOT = (RM_CAP_MEASUREMENT_PILOT_1 || - RM_CAP_MEASUREMENT_PILOT_2 || + RM_CAP_MEASUREMENT_PILOT = (RM_CAP_MEASUREMENT_PILOT_1 | + RM_CAP_MEASUREMENT_PILOT_2 | RM_CAP_MEASUREMENT_PILOT_3), };