Hi Mat,
> 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: Mat Martineau <mathewm@xxxxxxxxxxxxxx>
> ---
> net/bluetooth/l2cap_core.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 57b1b02..d7819c1 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -5615,8 +5615,9 @@ 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->move_state == L2CAP_MOVE_STABLE ||
can we just break the line width limit and put && at the end.
> + chan->move_state == L2CAP_MOVE_WAIT_PREPARE)) {
Otherwise this becomes hard to read.
> control->final = 0;
> l2cap_retransmit_all(chan, control);
> }
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
