Commit f351bc72 authored Oct 31, 2012 by Andrei Emeltchenko Committed by Gustavo Padovan Nov 01, 2012

Bluetooth: AMP: Check for hs_hcon instead of ctrl_id



When deciding whether to send EFS configuration response with success,
check rather for existence of High Speed physical link hs_hcon then
ctrl_id. There might be cases when there is ctrl_id but high speed link
is not established yet.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent 419e08c1

net/bluetooth/l2cap_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3921,7 +3921,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
		/* check compatibility */

		/* Send rsp for BR/EDR channel */
		if (!chan->ctrl_id)
		if (!chan->hs_hcon)
		l2cap_send_efs_conf_rsp(chan, rsp, cmd->ident, flags);
		else
		chan->ident = cmd->ident;
		@@ -3971,7 +3971,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn,
		goto done;
		}

		if (!chan->ctrl_id) {
		if (!chan->hs_hcon) {
		l2cap_send_efs_conf_rsp(chan, buf, cmd->ident,
		0);
		} else {