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.

Signed-off-by: Marcel Holtmann <[email protected]>
Signed-off-by: Johan Hedberg <[email protected]>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 2c6533a3f9372ea862c7a6a1711ab64c4851ad60..05370e76feb0db84aba98c4995277ffcbcc97fa1 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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)