diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-01 15:15:36 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 03:28:46 -0400 |
commit | d5392c8f1e9faef089bb7cb66c3314da8bddd1fe (patch) | |
tree | 4a935a46f0bfe2b9eb6d94f1d18fa079d2e1d095 /include/net | |
parent | e8235c6bdd1c7ffbaa7eb8dcdbb46c51f1e5d72e (diff) |
Bluetooth: Implement 'Send IorRRorRNR' event
After receive a RR with P bit set ERTM shall use this funcion to choose
what type of frame to reply with F bit = 1.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 17a689f27a6a..d9c20c3d6f3d 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
@@ -320,7 +320,7 @@ struct l2cap_pinfo { | |||
320 | __u8 conf_req[64]; | 320 | __u8 conf_req[64]; |
321 | __u8 conf_len; | 321 | __u8 conf_len; |
322 | __u8 conf_state; | 322 | __u8 conf_state; |
323 | __u8 conn_state; | 323 | __u16 conn_state; |
324 | 324 | ||
325 | __u8 next_tx_seq; | 325 | __u8 next_tx_seq; |
326 | __u8 expected_ack_seq; | 326 | __u8 expected_ack_seq; |
@@ -328,6 +328,7 @@ struct l2cap_pinfo { | |||
328 | __u8 buffer_seq; | 328 | __u8 buffer_seq; |
329 | __u8 buffer_seq_srej; | 329 | __u8 buffer_seq_srej; |
330 | __u8 srej_save_reqseq; | 330 | __u8 srej_save_reqseq; |
331 | __u8 frames_sent; | ||
331 | __u8 unacked_frames; | 332 | __u8 unacked_frames; |
332 | __u8 retry_count; | 333 | __u8 retry_count; |
333 | __u8 num_to_ack; | 334 | __u8 num_to_ack; |
@@ -367,14 +368,15 @@ struct l2cap_pinfo { | |||
367 | #define L2CAP_CONF_MAX_CONF_REQ 2 | 368 | #define L2CAP_CONF_MAX_CONF_REQ 2 |
368 | #define L2CAP_CONF_MAX_CONF_RSP 2 | 369 | #define L2CAP_CONF_MAX_CONF_RSP 2 |
369 | 370 | ||
370 | #define L2CAP_CONN_SAR_SDU 0x01 | 371 | #define L2CAP_CONN_SAR_SDU 0x0001 |
371 | #define L2CAP_CONN_SREJ_SENT 0x02 | 372 | #define L2CAP_CONN_SREJ_SENT 0x0002 |
372 | #define L2CAP_CONN_WAIT_F 0x04 | 373 | #define L2CAP_CONN_WAIT_F 0x0004 |
373 | #define L2CAP_CONN_SREJ_ACT 0x08 | 374 | #define L2CAP_CONN_SREJ_ACT 0x0008 |
374 | #define L2CAP_CONN_SEND_PBIT 0x10 | 375 | #define L2CAP_CONN_SEND_PBIT 0x0010 |
375 | #define L2CAP_CONN_REMOTE_BUSY 0x20 | 376 | #define L2CAP_CONN_REMOTE_BUSY 0x0020 |
376 | #define L2CAP_CONN_LOCAL_BUSY 0x40 | 377 | #define L2CAP_CONN_LOCAL_BUSY 0x0040 |
377 | #define L2CAP_CONN_REJ_ACT 0x80 | 378 | #define L2CAP_CONN_REJ_ACT 0x0080 |
379 | #define L2CAP_CONN_SEND_FBIT 0x0100 | ||
378 | 380 | ||
379 | #define __mod_retrans_timer() mod_timer(&l2cap_pi(sk)->retrans_timer, \ | 381 | #define __mod_retrans_timer() mod_timer(&l2cap_pi(sk)->retrans_timer, \ |
380 | jiffies + msecs_to_jiffies(L2CAP_DEFAULT_RETRANS_TO)); | 382 | jiffies + msecs_to_jiffies(L2CAP_DEFAULT_RETRANS_TO)); |