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

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

Bluetooth: Fix advertising data flags with disabled BR/EDR 



We shouldn't include the simultaneous LE & BR/EDR flags in the LE
advertising data if BR/EDR is disabled on a dual-mode controller. This
patch fixes this issue and ensures that the create_ad function generates
the correct flags when BR/EDR is disabled.

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

net/bluetooth/hci_core.c

+7 −7
Original line number Diff line number Diff line
@@ -1108,14 +1108,14 @@ static u8 create_ad(struct hci_dev *hdev, u8 *ptr) 
	if (test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags))

		flags |= LE_AD_GENERAL;



	if (!test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags))

		flags |= LE_AD_NO_BREDR;



	if (test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags)) {

		if (lmp_le_br_capable(hdev))

			flags |= LE_AD_SIM_LE_BREDR_CTRL;



		if (lmp_host_le_br_capable(hdev))

			flags |= LE_AD_SIM_LE_BREDR_HOST;

	} else {

		flags |= LE_AD_NO_BREDR;

	}



	if (flags) {

		BT_DBG("adv flags 0x%02x", flags);