diff options
| author | Mat Martineau <mathewm@codeaurora.org> | 2012-10-23 15:24:22 -0700 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-10-24 00:25:55 -0200 |
| commit | e6a3ee6e8aa27d0a38be7ead0c1624041697ffbc (patch) | |
| tree | 9cd954c1dbac53de63b00bfa1c29958120117add /net/bluetooth | |
| parent | a549574da39f0a6df68ffdb72dd015d04a8486de (diff) | |
| download | talos-obmc-linux-e6a3ee6e8aa27d0a38be7ead0c1624041697ffbc.tar.gz talos-obmc-linux-e6a3ee6e8aa27d0a38be7ead0c1624041697ffbc.zip | |
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: Mat Martineau <mathewm@codeaurora.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index ef86ebb92a00..93f1ebbd7502 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -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); } |
