dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Mat Martineau 2012-05-17 20:53:40 -07:00 committed by Johan Hedberg
parent 0a0aba42b8
commit 61aa4f5b9f
1 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
net/bluetooth/l2cap_core.c
View File

@ -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)
{
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);
BT_DBG("chan %p, Exit local busy", chan);
}
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);
}
u8 event;
if (chan->mode != L2CAP_MODE_ERTM)
return;
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)