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

Commit 8ed7a0ae authored by Szymon Janc's avatar Szymon Janc Committed by Johan Hedberg
Browse files

Bluetooth: Fix possible missing I-Frame acknowledgement 



Make l2cap_ertm_send return number of pending I-Frames transmitted
instead of all (pending + retransmitted) I-Frames transmitted.

As only pending I-Frames are considered as acknowledgement, this could
lead to situation when no ACK was sent in __l2cap_send_ack (if only
already transmitted I-Frames were retransmitted).

Signed-off-by: default avatarSzymon Janc <szymon.janc@tieto.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Acked-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 6d5922b0

net/bluetooth/l2cap_core.c

+3 −3
Original line number Diff line number Diff line
@@ -1453,8 +1453,10 @@ static int l2cap_ertm_send(struct l2cap_chan *chan) 


		chan->next_tx_seq = __next_seq(chan, chan->next_tx_seq);



		if (bt_cb(skb)->retries == 1)

		if (bt_cb(skb)->retries == 1) {

			chan->unacked_frames++;

			nsent++;

		}



		chan->frames_sent++;
@@ -1462,8 +1464,6 @@ static int l2cap_ertm_send(struct l2cap_chan *chan) 
			chan->tx_send_head = NULL;

		else

			chan->tx_send_head = skb_queue_next(&chan->tx_q, skb);



		nsent++;

	}



	return nsent;