--- 1.13/include/net/bluetooth/hci_core.h Thu Jun 5 02:57:06 2003 +++ edited/include/net/bluetooth/hci_core.h Sun Dec 21 02:29:01 2003 @@ -281,10 +281,9 @@ static inline void hci_conn_put(struct hci_conn *conn) { if (atomic_dec_and_test(&conn->refcnt)) { - if (conn->type == SCO_LINK) - hci_conn_set_timer(conn, HZ / 100); - else if (conn->out) - hci_conn_set_timer(conn, HCI_DISCONN_TIMEOUT); + unsigned long timeo = (conn->type == ACL_LINK) ? + HCI_DISCONN_TIMEOUT : HZ / 100; + hci_conn_set_timer(conn, timeo); } }