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

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

Bluetooth: Tweaks to l2cap_send_i_or_rr_or_rnr() flow 



l2cap_send_sframe() already set the F-bit if we set L2CAP_CONN_SEND_FBIT
and unset L2CAP_CONN_SEND_FBIT after send the 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 0e98958d

net/bluetooth/l2cap.c

+1 −2
Original line number Diff line number Diff line
@@ -3408,10 +3408,9 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct sock *sk) 
	control |= pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT;



	if (pi->conn_state & L2CAP_CONN_LOCAL_BUSY) {

		control |= L2CAP_SUPER_RCV_NOT_READY | L2CAP_CTRL_FINAL;

		control |= L2CAP_SUPER_RCV_NOT_READY;

		l2cap_send_sframe(pi, control);

		pi->conn_state |= L2CAP_CONN_RNR_SENT;

		pi->conn_state &= ~L2CAP_CONN_SEND_FBIT;

	}



	if (pi->conn_state & L2CAP_CONN_REMOTE_BUSY)