diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-29 15:28:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-29 15:28:49 -0400 |
| commit | dee04cac28b5f8a99e002ec1b2e0a49f3155bda0 (patch) | |
| tree | 28901cbdc89676bdfb17f6bbc8d4ff8bbedb2cd1 /include/net/bluetooth/hci.h | |
| parent | ce6cac88a4f1e52a51a31c31562f4da347543147 (diff) | |
| parent | 7cbc9bd99542752ff570abca79d0027669a01fb8 (diff) | |
| download | blackbird-op-linux-dee04cac28b5f8a99e002ec1b2e0a49f3155bda0.tar.gz blackbird-op-linux-dee04cac28b5f8a99e002ec1b2e0a49f3155bda0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'include/net/bluetooth/hci.h')
| -rw-r--r-- | include/net/bluetooth/hci.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 6138e313d175..e0a3cf1234b2 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -246,6 +246,15 @@ enum { #define HCI_AT_GENERAL_BONDING 0x04 #define HCI_AT_GENERAL_BONDING_MITM 0x05 +/* Link Key types */ +#define HCI_LK_COMBINATION 0x00 +#define HCI_LK_LOCAL_UNIT 0x01 +#define HCI_LK_REMOTE_UNIT 0x02 +#define HCI_LK_DEBUG_COMBINATION 0x03 +#define HCI_LK_UNAUTH_COMBINATION 0x04 +#define HCI_LK_AUTH_COMBINATION 0x05 +#define HCI_LK_CHANGED_COMBINATION 0x06 + /* ----- HCI Commands ---- */ #define HCI_OP_NOP 0x0000 |
