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

Commit 0952a57a authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Johan Hedberg
Browse files

Bluetooth: Change sk to l2cap_chan 



Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 5ef8cb9e

net/bluetooth/l2cap_core.c

+6 −5
Original line number Diff line number Diff line
@@ -1518,9 +1518,10 @@ static void l2cap_send_srejtail(struct l2cap_chan *chan) 
	l2cap_send_sframe(chan, control);

}



static inline int l2cap_skbuff_fromiovec(struct sock *sk, struct msghdr *msg, int len, int count, struct sk_buff *skb)

static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, struct msghdr *msg, int len, int count, struct sk_buff *skb)

{

	struct l2cap_conn *conn = l2cap_pi(sk)->chan->conn;

	struct sock *sk = chan->sk;

	struct l2cap_conn *conn = chan->conn;

	struct sk_buff **frag;

	int err, sent = 0;
@@ -1578,7 +1579,7 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan, 
	lh->len = cpu_to_le16(len + (hlen - L2CAP_HDR_SIZE));

	put_unaligned_le16(chan->psm, skb_put(skb, 2));



	err = l2cap_skbuff_fromiovec(sk, msg, len, count, skb);

	err = l2cap_skbuff_fromiovec(chan, msg, len, count, skb);

	if (unlikely(err < 0)) {

		kfree_skb(skb);

		return ERR_PTR(err);
@@ -1611,7 +1612,7 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan, 
	lh->cid = cpu_to_le16(chan->dcid);

	lh->len = cpu_to_le16(len + (hlen - L2CAP_HDR_SIZE));



	err = l2cap_skbuff_fromiovec(sk, msg, len, count, skb);

	err = l2cap_skbuff_fromiovec(chan, msg, len, count, skb);

	if (unlikely(err < 0)) {

		kfree_skb(skb);

		return ERR_PTR(err);
@@ -1661,7 +1662,7 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan, 
	if (sdulen)

		put_unaligned_le16(sdulen, skb_put(skb, L2CAP_SDULEN_SIZE));



	err = l2cap_skbuff_fromiovec(sk, msg, len, count, skb);

	err = l2cap_skbuff_fromiovec(chan, msg, len, count, skb);

	if (unlikely(err < 0)) {

		kfree_skb(skb);

		return ERR_PTR(err);