Commit 61aa4f5b authored by Mat Martineau's avatar Mat Martineau Committed by Johan Hedberg
Browse files

Bluetooth: Use the transmit state machine for busy state changes 



This lets the transmit state machine handle local busy state changes,
since different actions are taken in the different transmit states.

Signed-off-by: default avatarMat Martineau <mathewm@codeaurora.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 0a0aba42

net/bluetooth/l2cap_core.c

+6 −39
Original line number Diff line number Diff line
@@ -4318,48 +4318,15 @@ static int l2cap_reassemble_sdu(struct l2cap_chan *chan, struct sk_buff *skb, 
	return err;

}



static void l2cap_ertm_enter_local_busy(struct l2cap_chan *chan)

{

	BT_DBG("chan %p, Enter local busy", chan);



	set_bit(CONN_LOCAL_BUSY, &chan->conn_state);

	l2cap_seq_list_clear(&chan->srej_list);



	__set_ack_timer(chan);

}



static void l2cap_ertm_exit_local_busy(struct l2cap_chan *chan)

void l2cap_chan_busy(struct l2cap_chan *chan, int busy)

{

	u32 control;



	if (!test_bit(CONN_RNR_SENT, &chan->conn_state))

		goto done;



	control = __set_reqseq(chan, chan->buffer_seq);

	control |= __set_ctrl_poll(chan);

	control |= __set_ctrl_super(chan, L2CAP_SUPER_RR);

	chan->retry_count = 1;



	__clear_retrans_timer(chan);

	__set_monitor_timer(chan);



	set_bit(CONN_WAIT_F, &chan->conn_state);



done:

	clear_bit(CONN_LOCAL_BUSY, &chan->conn_state);

	clear_bit(CONN_RNR_SENT, &chan->conn_state);

	u8 event;



	BT_DBG("chan %p, Exit local busy", chan);

}

	if (chan->mode != L2CAP_MODE_ERTM)

		return;



void l2cap_chan_busy(struct l2cap_chan *chan, int busy)

{

	if (chan->mode == L2CAP_MODE_ERTM) {

		if (busy)

			l2cap_ertm_enter_local_busy(chan);

		else

			l2cap_ertm_exit_local_busy(chan);

	}

	event = busy ? L2CAP_EV_LOCAL_BUSY_DETECTED : L2CAP_EV_LOCAL_BUSY_CLEAR;

	l2cap_tx(chan, 0, 0, event);

}



static u8 l2cap_classify_txseq(struct l2cap_chan *chan, u16 txseq)