Commit 4c02e2d4 authored Jan 30, 2013 by Andre Guedes Committed by Gustavo Padovan Jan 31, 2013

Bluetooth: Fix hci_conn timeout routine



If occurs a LE or SCO hci_conn timeout and the connection is already
established (BT_CONNECTED state), the connection is not terminated as
expected. This bug can be reproduced using l2test or scotest tool.
Once the connection is established, kill l2test/scotest and the
connection won't be terminated.

This patch fixes hci_conn_disconnect helper so it is able to
terminate LE and SCO connections, as well as ACL.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent 8cf9fa12

net/bluetooth/hci_conn.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -249,12 +249,12 @@ static void hci_conn_disconnect(struct hci_conn *conn)
		__u8 reason = hci_proto_disconn_ind(conn);

		switch (conn->type) {
		case ACL_LINK:
		hci_acl_disconn(conn, reason);
		break;
		case AMP_LINK:
		hci_amp_disconn(conn, reason);
		break;
		default:
		hci_acl_disconn(conn, reason);
		break;
		}
		}