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

Commit b1a130b7 authored by Mat Martineau's avatar Mat Martineau Committed by Gustavo Padovan
Browse files

Bluetooth: Lookup channel structure based on DCID 



Processing a move channel request involves getting the channel
structure using the destination channel ID.  Previous code could only
look up using the source channel ID.

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

net/bluetooth/l2cap_core.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -100,6 +100,23 @@ static struct l2cap_chan *l2cap_get_chan_by_scid(struct l2cap_conn *conn, 
	return c;

	return c;

}

}





/* Find channel with given DCID.

 * Returns locked channel.

 */

static struct l2cap_chan *l2cap_get_chan_by_dcid(struct l2cap_conn *conn,

						 u16 cid)

{

	struct l2cap_chan *c;



	mutex_lock(&conn->chan_lock);

	c = __l2cap_get_chan_by_dcid(conn, cid);

	if (c)

		l2cap_chan_lock(c);

	mutex_unlock(&conn->chan_lock);



	return c;

}



static struct l2cap_chan *__l2cap_get_chan_by_ident(struct l2cap_conn *conn,

static struct l2cap_chan *__l2cap_get_chan_by_ident(struct l2cap_conn *conn,

						    u8 ident)

						    u8 ident)

{

{