Commit f21ca5ff authored Apr 08, 2011 by Luiz Augusto von Dentz Committed by Gustavo F. Padovan Apr 18, 2011

Bluetooth: fix shutdown on SCO sockets

shutdown should wait for SCO link to be properly disconnected before
detroying the socket, otherwise an application using the socket may
assume link is properly disconnected before it really happens which
can be a problem when e.g synchronizing profile switch.

Signed-off-by: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent b79f44c1

net/bluetooth/sco.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,15 @@ static void __sco_sock_close(struct sock *sk)

		case BT_CONNECTED:
		case BT_CONFIG:
		if (sco_pi(sk)->conn) {
		sk->sk_state = BT_DISCONN;
		sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);
		hci_conn_put(sco_pi(sk)->conn->hcon);
		sco_pi(sk)->conn = NULL;
		} else
		sco_chan_del(sk, ECONNRESET);
		break;

		case BT_CONNECT:
		case BT_DISCONN:
		sco_chan_del(sk, ECONNRESET);

Admin message