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

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

Bluetooth: Fix setting NO_BREDR advertising flag 



If we're dealing with a single-mode controller or BR/EDR is disable
for a dual-mode one, the NO_BREDR flag needs to be unconditionally
present in the advertising data. This patch moves it out from behind
an extra condition to be always set in the create_instance_adv_data()
function if BR/EDR is disabled.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 9ef280c6

net/bluetooth/hci_request.c

+3 −3
Original line number Diff line number Diff line
@@ -1065,6 +1065,9 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) 
	if (instance_flags & MGMT_ADV_FLAG_LIMITED_DISCOV)

		flags |= LE_AD_LIMITED;



	if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))

		flags |= LE_AD_NO_BREDR;



	if (flags || (instance_flags & MGMT_ADV_FLAG_MANAGED_FLAGS)) {

		/* If a discovery flag wasn't provided, simply use the global

		 * settings.
@@ -1072,9 +1075,6 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) 
		if (!flags)

			flags |= mgmt_get_adv_discov_flags(hdev);



		if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))

			flags |= LE_AD_NO_BREDR;



		/* If flags would still be empty, then there is no need to

		 * include the "Flags" AD field".

		 */