From 10f6bbe5447cc82f1b7a529bf0f072cfec6b38fd Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 23 Apr 2013 00:59:00 -0700 Subject: [PATCH] --- yaml --- r: 369841 b: refs/heads/master c: 72f78356a4a688d7286ac18c1b57d5507f68eefe h: refs/heads/master i: 369839: a6e8fd198e3b99a2a838898b59aae899a803a097 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_core.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2dfa6f01d5b9..4ca3c4dabde7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77a63e0a550a731d2bd330679696d8fe66bf94a9 +refs/heads/master: 72f78356a4a688d7286ac18c1b57d5507f68eefe diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index eae1d9f90b68..a76d1ac0321b 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -6314,12 +6314,13 @@ static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, kfree_skb(skb); } -static void l2cap_att_channel(struct l2cap_conn *conn, u16 cid, +static void l2cap_att_channel(struct l2cap_conn *conn, struct sk_buff *skb) { struct l2cap_chan *chan; - chan = l2cap_global_chan_by_scid(0, cid, conn->src, conn->dst); + chan = l2cap_global_chan_by_scid(0, L2CAP_CID_LE_DATA, + conn->src, conn->dst); if (!chan) goto drop; @@ -6368,7 +6369,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb) break; case L2CAP_CID_LE_DATA: - l2cap_att_channel(conn, cid, skb); + l2cap_att_channel(conn, skb); break; case L2CAP_CID_SMP: