Skip to content

Commit 8085277

Browse files
committed
Merge tag 'for-net-2025-07-03' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Luiz Augusto von Dentz says: ==================== bluetooth pull request for net: - hci_sync: Fix not disabling advertising instance - hci_core: Remove check of BDADDR_ANY in hci_conn_hash_lookup_big_state - hci_sync: Fix attempting to send HCI_Disconnect to BIS handle - hci_event: Fix not marking Broadcast Sink BIS as connected * tag 'for-net-2025-07-03' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth: Bluetooth: hci_event: Fix not marking Broadcast Sink BIS as connected Bluetooth: hci_sync: Fix attempting to send HCI_Disconnect to BIS handle Bluetooth: hci_core: Remove check of BDADDR_ANY in hci_conn_hash_lookup_big_state Bluetooth: hci_sync: Fix not disabling advertising instance ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents ffc2c8c + c734977 commit 8085277

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

include/net/bluetooth/hci_core.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,8 +1350,7 @@ hci_conn_hash_lookup_big_state(struct hci_dev *hdev, __u8 handle, __u16 state)
13501350
rcu_read_lock();
13511351

13521352
list_for_each_entry_rcu(c, &h->list, list) {
1353-
if (c->type != BIS_LINK || bacmp(&c->dst, BDADDR_ANY) ||
1354-
c->state != state)
1353+
if (c->type != BIS_LINK || c->state != state)
13551354
continue;
13561355

13571356
if (handle == c->iso_qos.bcast.big) {

net/bluetooth/hci_event.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6966,7 +6966,10 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,
69666966
bis->iso_qos.bcast.in.sdu = le16_to_cpu(ev->max_pdu);
69676967

69686968
if (!ev->status) {
6969+
bis->state = BT_CONNECTED;
69696970
set_bit(HCI_CONN_BIG_SYNC, &bis->flags);
6971+
hci_debugfs_create_conn(bis);
6972+
hci_conn_add_sysfs(bis);
69706973
hci_iso_setup_path(bis);
69716974
}
69726975
}

net/bluetooth/hci_sync.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ int hci_setup_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance)
13451345
* Command Disallowed error, so we must first disable the
13461346
* instance if it is active.
13471347
*/
1348-
if (adv && !adv->pending) {
1348+
if (adv) {
13491349
err = hci_disable_ext_adv_instance_sync(hdev, instance);
13501350
if (err)
13511351
return err;
@@ -5493,7 +5493,7 @@ static int hci_disconnect_sync(struct hci_dev *hdev, struct hci_conn *conn,
54935493
{
54945494
struct hci_cp_disconnect cp;
54955495

5496-
if (test_bit(HCI_CONN_BIG_CREATED, &conn->flags)) {
5496+
if (conn->type == BIS_LINK) {
54975497
/* This is a BIS connection, hci_conn_del will
54985498
* do the necessary cleanup.
54995499
*/

0 commit comments

Comments
 (0)