diff options
| author | Mat Martineau <mathewm@codeaurora.org> | 2011-07-07 09:39:03 -0700 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-07-07 15:29:06 -0300 |
| commit | fadd192e81b0a8d8086531b8c11bd88b311b68c2 (patch) | |
| tree | fc1cf6a8183382801e49a48f0440c589cfb16645 /include/net | |
| parent | e328140fdacbba43292a59a22fb55d9185288318 (diff) | |
| download | linux-fadd192e81b0a8d8086531b8c11bd88b311b68c2.tar.gz linux-fadd192e81b0a8d8086531b8c11bd88b311b68c2.tar.bz2 linux-fadd192e81b0a8d8086531b8c11bd88b311b68c2.zip | |
Bluetooth: Remove L2CAP busy queue
The ERTM receive buffer is now handled in a way that does not require
the busy queue and the associated polling code.
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 66b8d9688d9e..578545a2a492 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -37,7 +37,6 @@ #define L2CAP_DEFAULT_MONITOR_TO 12000 /* 12 seconds */ #define L2CAP_DEFAULT_MAX_PDU_SIZE 1009 /* Sized for 3-DH5 packet */ #define L2CAP_DEFAULT_ACK_TO 200 -#define L2CAP_LOCAL_BUSY_TRIES 12 #define L2CAP_LE_DEFAULT_MTU 23 #define L2CAP_CONN_TIMEOUT (40000) /* 40 seconds */ @@ -352,8 +351,6 @@ struct l2cap_chan { struct sk_buff *tx_send_head; struct sk_buff_head tx_q; struct sk_buff_head srej_q; - struct sk_buff_head busy_q; - struct work_struct busy_work; struct list_head srej_l; struct list_head list; @@ -450,7 +447,6 @@ enum { CONN_REJ_ACT, CONN_SEND_FBIT, CONN_RNR_SENT, - CONN_SAR_RETRY, }; #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) |