[Bluetooth]

Kill incoming SCO connection when SCO socket is closed

[Bluetooth]
Kill incoming SCO connection when SCO socket is closed
54a68364 · Maksim Krasnyanskiy · Marcel Holtmann · 6d33a83a · 54a68364
Commit 54a68364 authored Mar 19, 2003 by Maksim Krasnyanskiy Committed by Marcel Holtmann Mar 19, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

include/net/bluetooth/hci_core.h include/net/bluetooth/hci_core.h +5 -4

No files found.
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -280,10 +280,11 @@ 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) && conn->out) {
+	if (atomic_dec_and_test(&conn->refcnt)) {
-		unsigned long timeo = (conn->type == ACL_LINK) ? 
+		if (conn->type == SCO_LINK)
-					HCI_DISCONN_TIMEOUT : HZ / 100;
+			hci_conn_set_timer(conn, HZ / 100);
-		hci_conn_set_timer(conn, timeo);
+		else if (conn->out)
+			hci_conn_set_timer(conn, HCI_DISCONN_TIMEOUT);
 	}
 }