diff options
author | Mat Martineau <mathewm@codeaurora.org> | 2011-07-07 12:39:03 -0400 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-07-07 14:29:06 -0400 |
commit | fadd192e81b0a8d8086531b8c11bd88b311b68c2 (patch) | |
tree | fc1cf6a8183382801e49a48f0440c589cfb16645 /include/net | |
parent | e328140fdacbba43292a59a22fb55d9185288318 (diff) |
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 @@ | |||
37 | #define L2CAP_DEFAULT_MONITOR_TO 12000 /* 12 seconds */ | 37 | #define L2CAP_DEFAULT_MONITOR_TO 12000 /* 12 seconds */ |
38 | #define L2CAP_DEFAULT_MAX_PDU_SIZE 1009 /* Sized for 3-DH5 packet */ | 38 | #define L2CAP_DEFAULT_MAX_PDU_SIZE 1009 /* Sized for 3-DH5 packet */ |
39 | #define L2CAP_DEFAULT_ACK_TO 200 | 39 | #define L2CAP_DEFAULT_ACK_TO 200 |
40 | #define L2CAP_LOCAL_BUSY_TRIES 12 | ||
41 | #define L2CAP_LE_DEFAULT_MTU 23 | 40 | #define L2CAP_LE_DEFAULT_MTU 23 |
42 | 41 | ||
43 | #define L2CAP_CONN_TIMEOUT (40000) /* 40 seconds */ | 42 | #define L2CAP_CONN_TIMEOUT (40000) /* 40 seconds */ |
@@ -352,8 +351,6 @@ struct l2cap_chan { | |||
352 | struct sk_buff *tx_send_head; | 351 | struct sk_buff *tx_send_head; |
353 | struct sk_buff_head tx_q; | 352 | struct sk_buff_head tx_q; |
354 | struct sk_buff_head srej_q; | 353 | struct sk_buff_head srej_q; |
355 | struct sk_buff_head busy_q; | ||
356 | struct work_struct busy_work; | ||
357 | struct list_head srej_l; | 354 | struct list_head srej_l; |
358 | 355 | ||
359 | struct list_head list; | 356 | struct list_head list; |
@@ -450,7 +447,6 @@ enum { | |||
450 | CONN_REJ_ACT, | 447 | CONN_REJ_ACT, |
451 | CONN_SEND_FBIT, | 448 | CONN_SEND_FBIT, |
452 | CONN_RNR_SENT, | 449 | CONN_RNR_SENT, |
453 | CONN_SAR_RETRY, | ||
454 | }; | 450 | }; |
455 | 451 | ||
456 | #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) | 452 | #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) |