Skip to contentSkip to conversation

Bluetooth: Simplify if statements in tlv_data_is_valid function

PATCH In review Marcel Holtmann 1 participant 1 message Nov 19, 2015

Subsystems (2)
lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH 2/3 Bluetooth: Simplify if statements in tlv_data_is_valid function

The if statements for checking the flags parameter could be written a bit easier to read. This changes this. No functional behavior has been changed.

---
 net/bluetooth/mgmt.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
net/bluetooth/mgmt.c +11 -9
index 2c6533a3f937..05370e76feb0 100644
@@ -6700,17 +6700,19 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data,
 	int i, cur_len;
 	bool flags_managed = false;
 	bool tx_power_managed = false;
-	u32 flags_params = MGMT_ADV_FLAG_DISCOV | MGMT_ADV_FLAG_LIMITED_DISCOV |
-			   MGMT_ADV_FLAG_MANAGED_FLAGS;
 
-	if (is_adv_data && (adv_flags & flags_params)) {
-		flags_managed = true;
-		max_len -= 3;
-	}
+	if (is_adv_data) {
+		if (adv_flags & (MGMT_ADV_FLAG_DISCOV |
+				 MGMT_ADV_FLAG_LIMITED_DISCOV |
+				 MGMT_ADV_FLAG_MANAGED_FLAGS)) {
+			flags_managed = true;
+			max_len -= 3;
+		}
 
-	if (is_adv_data && (adv_flags & MGMT_ADV_FLAG_TX_POWER)) {
-		tx_power_managed = true;
-		max_len -= 3;
+		if (adv_flags & MGMT_ADV_FLAG_TX_POWER) {
+			tx_power_managed = true;
+			max_len -= 3;
+		}
 	}
 
 	if (len > max_len)
Signature · 1 line
2.5.0