On Thu, Oct 18, 2012 at 10:58:49AM -0700, Mat Martineau wrote: > 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> > Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx> Acked-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx> > --- > net/bluetooth/l2cap_core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index e89af62..8fa46de 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -5612,8 +5612,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); > } > -- > 1.7.12.3 > > -- > Mat Martineau > > Employee of Qualcomm Innovation Center, Inc. > The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- 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