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

Commit 3cb123d1 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Fix handle of received P-bit 



ERTM spec mandates that after receive a P-bit we shall send an F-bit in
response. This patch fixes this for retransmitted packets, on
retransmitting we were missing to check for a pending F-bit to be sent.
Also we were missing some annotation to send a F-bit.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: default avatarJoão Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2ece3684

net/bluetooth/l2cap.c

+12 −2
Original line number Diff line number Diff line
@@ -1430,10 +1430,15 @@ static void l2cap_retransmit_one_frame(struct sock *sk, u8 tx_seq) 
	tx_skb = skb_clone(skb, GFP_ATOMIC);

	bt_cb(skb)->retries++;

	control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);

	control &= L2CAP_CTRL_SAR;



	if (pi->conn_state & L2CAP_CONN_SEND_FBIT) {

		control |= L2CAP_CTRL_FINAL;

		pi->conn_state &= ~L2CAP_CONN_SEND_FBIT;

	}



	control |= (pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT)

			| (tx_seq << L2CAP_CTRL_TXSEQ_SHIFT);



	put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);



	if (pi->fcs == L2CAP_FCS_CRC16) {
@@ -3385,7 +3390,6 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct sock *sk) 
	u16 control = 0;



	pi->frames_sent = 0;

	pi->conn_state |= L2CAP_CONN_SEND_FBIT;



	control |= pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT;
@@ -3963,6 +3967,7 @@ static inline void l2cap_data_channel_rrframe(struct sock *sk, u16 rx_control) 
	l2cap_drop_acked_frames(sk);



	if (rx_control & L2CAP_CTRL_POLL) {

		pi->conn_state |= L2CAP_CONN_SEND_FBIT;

		if (pi->conn_state & L2CAP_CONN_SREJ_SENT) {

			if ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) &&

					(pi->unacked_frames > 0))
@@ -4030,6 +4035,8 @@ static inline void l2cap_data_channel_srejframe(struct sock *sk, u16 rx_control) 
	if (rx_control & L2CAP_CTRL_POLL) {

		pi->expected_ack_seq = tx_seq;

		l2cap_drop_acked_frames(sk);



		pi->conn_state |= L2CAP_CONN_SEND_FBIT;

		l2cap_retransmit_one_frame(sk, tx_seq);



		spin_lock_bh(&pi->send_lock);
@@ -4064,6 +4071,9 @@ static inline void l2cap_data_channel_rnrframe(struct sock *sk, u16 rx_control) 
	pi->expected_ack_seq = tx_seq;

	l2cap_drop_acked_frames(sk);



	if (rx_control & L2CAP_CTRL_POLL)

		pi->conn_state |= L2CAP_CONN_SEND_FBIT;



	if (!(pi->conn_state & L2CAP_CONN_SREJ_SENT)) {

		del_timer(&pi->retrans_timer);

		if (rx_control & L2CAP_CTRL_POLL)