ソースを参照

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
Srinivas Girigowda 8 年 前
コミット
eda9c1ea69
1 ファイル変更7 行追加7 行削除
  1. 7 7
      core/mac/src/pe/include/rrm_global.h

+ 7 - 7
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),
 };