diff options
| author | Nick Pelly <npelly@google.com> | 2010-03-09 12:08:00 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-09-29 17:49:30 -0700 |
| commit | a573f82deb59d887f256beb482f224071fcf9a2e (patch) | |
| tree | 555af04b3916331b1fa5ee1dc8a6a9db2f507dbe /include | |
| parent | d5fb3c725b05af74430fcbe52e6ae2fc9bfa5a1e (diff) | |
Revert "Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL packets."
This reverts commit d7897fd1e9fb3a5df0740dc2dc45ec94ca0965f2.
Change-Id: I3401550b6dc97b683104e9fdac30a617a2db8c8e
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci.h | 5 | ||||
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 559f7917d872..b5c80f86a1ee 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -152,14 +152,11 @@ enum { EDR_ESCO_MASK) /* ACL flags */ -#define ACL_START 0x00 #define ACL_CONT 0x01 -#define ACL_START_FLUSHABLE 0x02 +#define ACL_START 0x02 #define ACL_ACTIVE_BCAST 0x04 #define ACL_PICO_BCAST 0x08 -#define ACL_PB_MASK (ACL_CONT | ACL_START | ACL_START_FLUSHABLE) - /* Baseband links */ #define SCO_LINK 0x00 #define ACL_LINK 0x01 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index bcb78529c390..6c241444f902 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -75,7 +75,6 @@ struct l2cap_conninfo { #define L2CAP_LM_TRUSTED 0x0008 #define L2CAP_LM_RELIABLE 0x0010 #define L2CAP_LM_SECURE 0x0020 -#define L2CAP_LM_FLUSHABLE 0x0040 /* L2CAP command codes */ #define L2CAP_COMMAND_REJ 0x01 @@ -328,7 +327,6 @@ struct l2cap_pinfo { __u8 sec_level; __u8 role_switch; __u8 force_reliable; - __u8 flushable; __u8 conf_req[64]; __u8 conf_len; |