Commit e6a3ee6e authored by Mat Martineau's avatar Mat Martineau Committed by Gustavo Padovan
Browse files

Bluetooth: Do not retransmit data during a channel move 



Do not retransmit previously-sent data when a "receiver ready" s-frame
with the "final" flag is received during a move.

The ERTM state machines will resynchronize at the end of a channel
move, and the state machine needs to avoid state changes during a
move.

Signed-off-by: default avatarMat Martineau <mathewm@codeaurora.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Acked-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent a549574d

net/bluetooth/l2cap_core.c

+2 −2
Original line number Diff line number Diff line
@@ -5591,8 +5591,8 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan, 
		if (control->final) {

			clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);



			if (!test_and_clear_bit(CONN_REJ_ACT,

						&chan->conn_state)) {

			if (!test_and_clear_bit(CONN_REJ_ACT, &chan->conn_state) &&

			    !__chan_is_moving(chan)) {

				control->final = 0;

				l2cap_retransmit_all(chan, control);

			}