diff options
| author | Erfan Abdi <erfangplus@gmail.com> | 2018-07-06 02:22:05 +0430 |
|---|---|---|
| committer | Erfan Abdi <erfangplus@gmail.com> | 2018-07-11 11:51:28 +0430 |
| commit | d3c0ac3e1ff99f0e7330e22d698c16f72d77ca87 (patch) | |
| tree | def5d61633a7e583765c3113a4ad7014be96d79f | |
| parent | 82cc402b29cef2a636e86ca789a56971648f8a62 (diff) | |
qcacld-2.0: suppress more errors
* use '|' for a bitwise operation in rrmGlobal.h
Change-Id: I43aabe1138dc11fac5837e81d240e9a666cf802d
Signed-off-by: Erfan Abdi <erfangplus@gmail.com>
| -rw-r--r-- | drivers/staging/qcacld-2.0/CORE/MAC/src/pe/include/rrmGlobal.h | 12 | ||||
| -rw-r--r-- | drivers/staging/qcacld-2.0/Kbuild | 2 |
2 files changed, 8 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), }; diff --git a/drivers/staging/qcacld-2.0/Kbuild b/drivers/staging/qcacld-2.0/Kbuild index ba52ba8780af..0e278d9d4479 100644 --- a/drivers/staging/qcacld-2.0/Kbuild +++ b/drivers/staging/qcacld-2.0/Kbuild @@ -1708,6 +1708,8 @@ EXTRA_CFLAGS += -Wno-typedef-redefinition EXTRA_CFLAGS += -Wno-shift-count-overflow EXTRA_CFLAGS += -Wno-non-literal-null-conversion EXTRA_CFLAGS += -Wno-logical-not-parentheses +EXTRA_CFLAGS += -Wno-parentheses-equality +EXTRA_CFLAGS += -Wno-constant-logical-operand endif # If the module name is not "wlan", then the define MULTI_IF_NAME to be the |