aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorMat Martineau <mathewm@codeaurora.org>2012-10-23 15:24:09 -0700
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-10-24 00:01:53 -0200
commitb1a130b7d372c5ccc2001d4ee08928b5324f0a76 (patch)
tree8b436e6b47ead2474ef865c9c210e3fed588962c /net/bluetooth/l2cap_core.c
parent5909cf30f380d13bb59e81e4cb17c3714cb94e68 (diff)
downloadkernel_goldelico_gta04-b1a130b7d372c5ccc2001d4ee08928b5324f0a76.zip
kernel_goldelico_gta04-b1a130b7d372c5ccc2001d4ee08928b5324f0a76.tar.gz
kernel_goldelico_gta04-b1a130b7d372c5ccc2001d4ee08928b5324f0a76.tar.bz2
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: Mat Martineau <mathewm@codeaurora.org> Acked-by: Marcel Holtmann <marcel@holtmann.org> Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 3175094..03daae8 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -100,6 +100,23 @@ static struct l2cap_chan *l2cap_get_chan_by_scid(struct l2cap_conn *conn,
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,
u8 ident)
{