Bluetooth: hci_event: Fix re-enabling passive scan when disconnecting a CIS
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: hci_event: Fix re-enabling passive scan when disconnecting a CIS
From: Luiz Augusto von Dentz <[email protected]>
The code was re-enabling passive scan regardless of the link type and role, so this instead only re-enable when the link type is an LE_LINK and the role is HCI_ROLE_MASTER.
Fixes 9fcb18ef3acb ("Bluetooth: Introduce LE auto connect options")
Signed-off-by Luiz Augusto von Dentz <[email protected]>
--- net/bluetooth/hci_event.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-)
net/bluetooth/hci_event.c +22 -15
@@ -3393,23 +3393,30 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, void *data,hci_update_scan (hdev); } - params =hci_conn_params_lookup (hdev, &conn->dst, conn->dst_type); -if (params) { -switch (params->auto_connect) { -case HCI_AUTO_CONN_LINK_LOSS : -if (ev->reason !=HCI_ERROR_CONNECTION_TIMEOUT ) +/* Re-enable passive scanning if necessary, since it migth have been +* disabled by a connection. +*/ +if (conn->type ==LE_LINK && conn->role ==HCI_ROLE_MASTER ) { + params =hci_conn_params_lookup (hdev, &conn->dst, + conn->dst_type); +if (params) { +switch (params->auto_connect) { +case HCI_AUTO_CONN_LINK_LOSS : +if (ev->reason !=HCI_ERROR_CONNECTION_TIMEOUT ) +break ; + fallthrough; + +case HCI_AUTO_CONN_DIRECT : +case HCI_AUTO_CONN_ALWAYS : +hci_pend_le_list_del_init (params); +hci_pend_le_list_add (params, + &hdev->pend_le_conns); +hci_update_passive_scan (hdev);break ; - fallthrough; -case HCI_AUTO_CONN_DIRECT : -case HCI_AUTO_CONN_ALWAYS : -hci_pend_le_list_del_init (params); -hci_pend_le_list_add (params, &hdev->pend_le_conns); -hci_update_passive_scan (hdev); -break ; - -default : -break ; +default : +break ; + } } }
Signature · 1 line
2.46.0