aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth/l2cap.h
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2011-10-11 07:04:31 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-10-11 09:44:44 -0400
commitd57b0e8b8990419b7b7ae0dda5cc4452720b3c7c (patch)
tree1e08d57106396709bdfc261d86b7fd85c00ca8cd /include/net/bluetooth/l2cap.h
parentd4b8d1c9c1564f4cbce86cbbee099fadf735b226 (diff)
Bluetooth: convert flushable variable to flag in l2cap chan
flushable variable inside l2cap_chan is a logical one and can be easily converted to flag. Added flags in l2cap_chan structure. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
-rw-r--r--include/net/bluetooth/l2cap.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 293376750dc4..0fe5d59b71a3 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -326,7 +326,6 @@ struct l2cap_chan {
326 __u8 sec_level; 326 __u8 sec_level;
327 __u8 role_switch; 327 __u8 role_switch;
328 __u8 force_reliable; 328 __u8 force_reliable;
329 __u8 flushable;
330 __u8 force_active; 329 __u8 force_active;
331 330
332 __u8 ident; 331 __u8 ident;
@@ -346,6 +345,7 @@ struct l2cap_chan {
346 345
347 unsigned long conf_state; 346 unsigned long conf_state;
348 unsigned long conn_state; 347 unsigned long conn_state;
348 unsigned long flags;
349 349
350 __u8 next_tx_seq; 350 __u8 next_tx_seq;
351 __u8 expected_ack_seq; 351 __u8 expected_ack_seq;
@@ -463,6 +463,11 @@ enum {
463 CONN_RNR_SENT, 463 CONN_RNR_SENT,
464}; 464};
465 465
466/* Definitions for flags in l2cap_chan */
467enum {
468 FLAG_FLUSHABLE,
469};
470
466#define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) 471#define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t))
467#define __clear_chan_timer(c) l2cap_clear_timer(c, &c->chan_timer) 472#define __clear_chan_timer(c) l2cap_clear_timer(c, &c->chan_timer)
468#define __set_retrans_timer(c) l2cap_set_timer(c, &c->retrans_timer, \ 473#define __set_retrans_timer(c) l2cap_set_timer(c, &c->retrans_timer, \