From 71f644c0dec2b329e7ee9e0580d56d9da7bb53a0 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 13 Jan 2004 06:17:12 +0100 Subject: [Bluetooth] Set disconnect timer for incoming ACL links In general a Bluetooth stack that creates an ACL link should also take care of its termination, but some Bluetooth devices think otherwise. The problem is that the Bluetooth specification don't defines an ownership of an ACL link and if nobody cares about it, two devices stay connected even if there is no need. To avoid leftover ACL links the disconnect timer must also be used for incoming connections, but it is set twice the default disconnect timeout so the other side get enough time to clean everything by itself. --- include/net/bluetooth/hci_core.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index fd010a9dc75e..dd11dfdfe0bd 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -281,10 +281,12 @@ static inline void hci_conn_hold(struct hci_conn *conn) static inline void hci_conn_put(struct hci_conn *conn) { if (atomic_dec_and_test(&conn->refcnt)) { - if (conn->type == SCO_LINK) + if (conn->type == ACL_LINK) { + unsigned long timeo = (conn->out) ? + HCI_DISCONN_TIMEOUT : HCI_DISCONN_TIMEOUT * 2; + hci_conn_set_timer(conn, timeo); + } else hci_conn_set_timer(conn, HZ / 100); - else if (conn->out) - hci_conn_set_timer(conn, HCI_DISCONN_TIMEOUT); } } -- cgit v1.2.3