diff options
| author | Nathan Chancellor <natechancellor@gmail.com> | 2018-05-09 18:33:26 -0700 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2022-07-27 18:37:11 +0200 |
| commit | e48c15a527c9d9404d0df83a1a7d7a7ad8080b69 (patch) | |
| tree | f1cc96bed452b799f70ca2eee05225633e9db790 | |
| parent | 94cf4d3f1716bb81f58339180043a4862ebb47ad (diff) | |
qcacld-2.0: Convert logical ORs to bitwise ORs
Fixes Clang warning constant-logical-operand.
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
| -rw-r--r-- | drivers/staging/qcacld-2.0/CORE/MAC/src/pe/include/rrmGlobal.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/include/rrmGlobal.h b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/include/rrmGlobal.h index 7b6b08f7359d..d39f6d700535 100644 --- a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/include/rrmGlobal.h +++ b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/include/rrmGlobal.h @@ -300,12 +300,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), }; @@ -331,8 +331,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), }; |