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

Bluetooth: Do not send data during channel move 



Outgoing ERTM data is queued during a channel move.  The ERTM state
machine is partially reset at the start of a move, and must be
resynchronized with the remote state machine at the end of the move.
Data is not sent so that there are no state transitions between the
partial reset and the resync.

Streaming mode frames are dropped 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 d5f8a75d

net/bluetooth/l2cap_core.c

+12 −0
Original line number Diff line number Diff line
@@ -947,6 +947,9 @@ static void l2cap_send_sframe(struct l2cap_chan *chan, 
	if (!control->sframe)

		return;



	if (__chan_is_moving(chan))

		return;



	if (test_and_clear_bit(CONN_SEND_FBIT, &chan->conn_state) &&

	    !control->poll)

		control->final = 1;
@@ -1811,6 +1814,9 @@ static void l2cap_streaming_send(struct l2cap_chan *chan, 


	BT_DBG("chan %p, skbs %p", chan, skbs);



	if (__chan_is_moving(chan))

		return;



	skb_queue_splice_tail_init(skbs, &chan->tx_q);



	while (!skb_queue_empty(&chan->tx_q)) {
@@ -1853,6 +1859,9 @@ static int l2cap_ertm_send(struct l2cap_chan *chan) 
	if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))

		return 0;



	if (__chan_is_moving(chan))

		return 0;



	while (chan->tx_send_head &&

	       chan->unacked_frames < chan->remote_tx_win &&

	       chan->tx_state == L2CAP_TX_STATE_XMIT) {
@@ -1918,6 +1927,9 @@ static void l2cap_ertm_resend(struct l2cap_chan *chan) 
	if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))

		return;



	if (__chan_is_moving(chan))

		return;



	while (chan->retrans_list.head != L2CAP_SEQ_LIST_CLEAR) {

		seq = l2cap_seq_list_pop(&chan->retrans_list);