Bluetooth: mgmt: multi adv for get_adv_instance_flags() (411b4121) · Commits · 戴 / test

The get_adv_instance_flags() would not work with instance identifiers other than 0x01. This is being fixed so that arbitrary instance identifiers can be dealt with while still correctly dealing with the special case of the 0x00 identifier. Signed-off-by:

Florian Grandel <fgrandel@gmail.com> Signed-off-by:

Marcel Holtmann <marcel@holtmann.org>

net/bluetooth/mgmt.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -960,12 +960,17 @@ static bool get_connectable(struct hci_dev *hdev)
		static u32 get_adv_instance_flags(struct hci_dev *hdev, u8 instance)
		{
		u32 flags;
		struct adv_info *adv_instance;

		if (instance != 0x00) {
		adv_instance = hci_find_adv_instance(hdev, instance);

		if (instance > 0x01)
		/* Return 0 when we got an invalid instance identifier. */
		if (!adv_instance)
		return 0;

		if (instance == 0x01)
		return hdev->adv_instance.flags;
		return adv_instance->flags;
		}

		/* Instance 0 always manages the "Tx Power" and "Flags" fields */
		flags = MGMT_ADV_FLAG_TX_POWER \| MGMT_ADV_FLAG_MANAGED_FLAGS;

Admin message