Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62748ca1 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Fix sending L2CAP Create Chan Req 



When receiving Physical Link Completed event we need to create L2CAP
channel with L2CAP Create Chan Request. Current code was sending
this command only if connection was pending (which is probably
needed in channel move case). If channel is not moved but created
Create Chan should be sent for outgoing channel which is checked
with BT_CONNECT flag.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent d1244adc

net/bluetooth/l2cap_core.c

+18 −11
Original line number Diff line number Diff line
@@ -4517,15 +4517,31 @@ void l2cap_move_start(struct l2cap_chan *chan) 
static void l2cap_do_create(struct l2cap_chan *chan, int result,

			    u8 local_amp_id, u8 remote_amp_id)

{

	BT_DBG("chan %p state %s %u -> %u", chan, state_to_string(chan->state),

	       local_amp_id, remote_amp_id);



	chan->fcs = L2CAP_FCS_NONE;



	if (!test_bit(CONF_CONNECT_PEND, &chan->conf_state)) {

	/* Outgoing channel on AMP */

	if (chan->state == BT_CONNECT) {

		if (result == L2CAP_CR_SUCCESS) {

			chan->local_amp_id = local_amp_id;

			l2cap_send_create_chan_req(chan, remote_amp_id);

		} else {

			/* Revert to BR/EDR connect */

			l2cap_send_conn_req(chan);

		}



		return;

	}



	/* Incoming channel on AMP */

	if (__l2cap_no_conn_pending(chan)) {

		struct l2cap_conn_rsp rsp;

		char buf[128];

		rsp.scid = cpu_to_le16(chan->dcid);

		rsp.dcid = cpu_to_le16(chan->scid);



		/* Incoming channel on AMP */

		if (result == L2CAP_CR_SUCCESS) {

			/* Send successful response */

			rsp.result = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);
@@ -4547,15 +4563,6 @@ static void l2cap_do_create(struct l2cap_chan *chan, int result, 
				       l2cap_build_conf_req(chan, buf), buf);

			chan->num_conf_req++;

		}

	} else {

		/* Outgoing channel on AMP */

		if (result == L2CAP_CR_SUCCESS) {

			chan->local_amp_id = local_amp_id;

			l2cap_send_create_chan_req(chan, remote_amp_id);

		} else {

			/* Revert to BR/EDR connect */

			l2cap_send_conn_req(chan);

		}

	}

}