diff options
| author | Srinivas Girigowda <sgirigow@codeaurora.org> | 2017-04-04 17:43:59 -0700 |
|---|---|---|
| committer | Sandeep Puligilla <spuligil@codeaurora.org> | 2017-04-06 21:33:12 -0700 |
| commit | 165c209f400d91eaa5a6ff52de8c0c1a64beb757 (patch) | |
| tree | bf5d7883bb9d83696a83a227d2c4ae199cee26dc | |
| parent | ff466a39ed5f587e5424bde6e56ae2fa5d4f787f (diff) | |
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
| -rw-r--r-- | core/mac/src/pe/include/rrm_global.h | 14 |
1 files 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), }; |