patch-2.4.25 linux-2.4.25/include/net/bluetooth/hci_core.h

• Lines: 29
• Date: 2004-02-18 05:36:32.000000000 -0800
• Orig file: linux-2.4.24/include/net/bluetooth/hci_core.h
• Orig date: 2003-06-13 07:51:39.000000000 -0700

diff -urN linux-2.4.24/include/net/bluetooth/hci_core.h linux-2.4.25/include/net/bluetooth/hci_core.h
@@ -167,6 +167,12 @@
 	c->list = NULL;
 }
 
+static inline int inquiry_cache_empty(struct hci_dev *hdev)
+{
+	struct inquiry_cache *c = &hdev->inq_cache;
+	return (c->list == NULL);
+}
+
 static inline long inquiry_cache_age(struct hci_dev *hdev)
 {
 	struct inquiry_cache *c = &hdev->inq_cache;
@@ -282,10 +288,12 @@
 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);
 	}
 }