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

Commit d119b066 authored by Lukasz Rymanowski's avatar Lukasz Rymanowski Committed by Kamal Negi
Browse files

Bluetooth: Fix ERTM L2CAP resend packet 



I-Frame which is going to be resend already has FCS field added and set
(if it was required). Adding additional FCS field calculated from data +
old FCS in resend function is incorrect. This patch fix that.

Issue has been found during PTS testing.

Change-Id: Iba211a180665c5f2fa2fa462f5d5c48e2d980a21
Signed-off-by: default avatarLukasz Rymanowski <lukasz.rymanowski@tieto.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Git-commit: 13cac15296afe7e42088ecfcd0f1d4b658248c46
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarKamal Negi <kamaln@codeaurora.org>
parent 92676289

net/bluetooth/l2cap_core.c

+5 −3
Original line number Diff line number Diff line
@@ -2101,10 +2101,12 @@ static void l2cap_ertm_resend(struct l2cap_chan *chan) 
					   tx_skb->data + L2CAP_HDR_SIZE);

		}



		/* Update FCS */

		if (chan->fcs == L2CAP_FCS_CRC16) {

			u16 fcs = crc16(0, (u8 *) tx_skb->data, tx_skb->len);

			put_unaligned_le16(fcs, skb_put(tx_skb,

							L2CAP_FCS_SIZE));

			u16 fcs = crc16(0, (u8 *) tx_skb->data,

					tx_skb->len - L2CAP_FCS_SIZE);

			put_unaligned_le16(fcs, skb_tail_pointer(tx_skb) -

						L2CAP_FCS_SIZE);

		}



		l2cap_do_send(chan, tx_skb);