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

Commit 72f78356 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Gustavo Padovan
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 77a63e0a

net/bluetooth/l2cap_core.c

+4 −3
Original line number Diff line number Diff line
@@ -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: