Bluetooth: Fix advertising data flags with disabled BR/EDR
Subsystems (2)
PATCH 1/1 Bluetooth: Fix advertising data flags with disabled BR/EDR
From: Johan Hedberg <[email protected]>
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 Johan Hedberg <[email protected]>
--- net/bluetooth/hci_core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/bluetooth/hci_core.c +7 -7
@@ -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)) +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 (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 ; + }if (flags) {BT_DBG ("adv flags 0x%02x" , flags);
Signature · 1 line
1.8.3.1
Marcel Holtmann
maintainerHi Johan,
Quoted 9 lines
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_adfunction generates the correct flags when BR/EDR is disabled.Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/hci_core.c| 14 +++++++-------1 file changed, 7 insertions(+), 7 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel