Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31a3248d authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent ceff86af

net/bluetooth/mgmt.c

+11 −9
Original line number Diff line number Diff line
@@ -6700,18 +6700,20 @@ 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)) {

	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)) {

		if (adv_flags & MGMT_ADV_FLAG_TX_POWER) {

			tx_power_managed = true;

			max_len -= 3;

		}

	}



	if (len > max_len)

		return false;