Commit 1b0336bb authored May 09, 2009 by Marcel Holtmann

Bluetooth: Don't use hci_acl_connect_cancel() for incoming connections



The connection setup phase takes around 2 seconds or longer and in
that time it is possible that the need for an ACL connection is no
longer present. If that happens then, the connection attempt will
be canceled.

This only applies to outgoing connections, but currently it can also
be triggered by incoming connection. Don't call hci_acl_connect_cancel()
on incoming connection since these have to be either accepted or rejected
in this state. Once they are successfully connected they need to be
fully disconnected anyway.

Also remove the wrong hci_acl_disconn() call for SCO and eSCO links
since at this stage they can't be disconnected either, because the
connection handle is still unknown.

Based on a report by Johan Hedberg <johan.hedberg@nokia.com>

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Tested-by: Johan Hedberg <johan.hedberg@nokia.com>

parent 384943ec

net/bluetooth/hci_conn.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -171,10 +171,8 @@ static void hci_conn_timeout(unsigned long arg)
		switch (conn->state) {
		case BT_CONNECT:
		case BT_CONNECT2:
		if (conn->type == ACL_LINK)
		if (conn->type == ACL_LINK && conn->out)
		hci_acl_connect_cancel(conn);
		else
		hci_acl_disconn(conn, 0x13);
		break;
		case BT_CONFIG:
		case BT_CONNECTED:

Admin message