aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-04-23 03:59:00 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-04-23 19:32:23 -0400
commit72f78356a4a688d7286ac18c1b57d5507f68eefe (patch)
tree57af81a830d1d1dd8eb81490378878fb6bc18d79
parent77a63e0a550a731d2bd330679696d8fe66bf94a9 (diff)
Bluetooth: Remove unneeded parameter from L2CAP ATT channel handling
The CID is fixed to L2CAP ATT channel and so there is no need to hand it down to the handling function. Just use a constant instead. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--net/bluetooth/l2cap_core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index eae1d9f90b68..a76d1ac0321b 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6314,12 +6314,13 @@ drop:
6314 kfree_skb(skb); 6314 kfree_skb(skb);
6315} 6315}
6316 6316
6317static void l2cap_att_channel(struct l2cap_conn *conn, u16 cid, 6317static void l2cap_att_channel(struct l2cap_conn *conn,
6318 struct sk_buff *skb) 6318 struct sk_buff *skb)
6319{ 6319{
6320 struct l2cap_chan *chan; 6320 struct l2cap_chan *chan;
6321 6321
6322 chan = l2cap_global_chan_by_scid(0, cid, conn->src, conn->dst); 6322 chan = l2cap_global_chan_by_scid(0, L2CAP_CID_LE_DATA,
6323 conn->src, conn->dst);
6323 if (!chan) 6324 if (!chan)
6324 goto drop; 6325 goto drop;
6325 6326
@@ -6368,7 +6369,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
6368 break; 6369 break;
6369 6370
6370 case L2CAP_CID_LE_DATA: 6371 case L2CAP_CID_LE_DATA:
6371 l2cap_att_channel(conn, cid, skb); 6372 l2cap_att_channel(conn, skb);
6372 break; 6373 break;
6373 6374
6374 case L2CAP_CID_SMP: 6375 case L2CAP_CID_SMP: