tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Bluetooth: HCI: Fix tracking of advertisement set/instance 0x00
This fixes the state tracking of advertisement set/instance 0x00 which
is considered a legacy instance and is not tracked individually by
adv_instances list, previously it was assumed that hci_dev itself would
track it via HCI_LE_ADV but that is a global state not specifc to
instance 0x00, so to fix it a new flag is introduced that only tracks the
state of instance 0x00.
Fixes: 1488af7b8b5f ("Bluetooth: hci_sync: Fix hci_resume_advertising_sync")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+7
-3
+1
include/net/bluetooth/hci.h
+1
include/net/bluetooth/hci.h
+4
net/bluetooth/hci_event.c
+4
net/bluetooth/hci_event.c
···
1609
1609
1610
1610
if (adv && !adv->periodic)
1611
1611
adv->enabled = true;
1612
+
else if (!set->handle)
1613
+
hci_dev_set_flag(hdev, HCI_LE_ADV_0);
1612
1614
1613
1615
conn = hci_lookup_le_connect(hdev);
1614
1616
if (conn)
···
1621
1619
if (cp->num_of_sets) {
1622
1620
if (adv)
1623
1621
adv->enabled = false;
1622
+
else if (!set->handle)
1623
+
hci_dev_clear_flag(hdev, HCI_LE_ADV_0);
1624
1624
1625
1625
/* If just one instance was disabled check if there are
1626
1626
* any other instance enabled before clearing HCI_LE_ADV
+2
-3
net/bluetooth/hci_sync.c
+2
-3
net/bluetooth/hci_sync.c
···
2606
2606
/* If current advertising instance is set to instance 0x00
2607
2607
* then we need to re-enable it.
2608
2608
*/
2609
-
if (!hdev->cur_adv_instance)
2610
-
err = hci_enable_ext_advertising_sync(hdev,
2611
-
hdev->cur_adv_instance);
2609
+
if (hci_dev_test_and_clear_flag(hdev, HCI_LE_ADV_0))
2610
+
err = hci_enable_ext_advertising_sync(hdev, 0x00);
2612
2611
} else {
2613
2612
/* Schedule for most recent instance to be restarted and begin
2614
2613
* the software rotation loop