diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 17:09:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 17:09:28 -0400 |
| commit | 90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2 (patch) | |
| tree | 6951c8d0e529dbfc7c4cec75d4cec63350e39b7c /include/net/bluetooth/hci.h | |
| parent | 228e548e602061b08ee8e8966f567c12aa079682 (diff) | |
| parent | a70171dce9cd44cb06c7d299eba9fa87a8933045 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 499b7b7c7c9a..0c20227e57f6 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
| @@ -246,6 +246,15 @@ enum { | |||
| 246 | #define HCI_AT_GENERAL_BONDING 0x04 | 246 | #define HCI_AT_GENERAL_BONDING 0x04 |
| 247 | #define HCI_AT_GENERAL_BONDING_MITM 0x05 | 247 | #define HCI_AT_GENERAL_BONDING_MITM 0x05 |
| 248 | 248 | ||
| 249 | /* Link Key types */ | ||
| 250 | #define HCI_LK_COMBINATION 0x00 | ||
| 251 | #define HCI_LK_LOCAL_UNIT 0x01 | ||
| 252 | #define HCI_LK_REMOTE_UNIT 0x02 | ||
| 253 | #define HCI_LK_DEBUG_COMBINATION 0x03 | ||
| 254 | #define HCI_LK_UNAUTH_COMBINATION 0x04 | ||
| 255 | #define HCI_LK_AUTH_COMBINATION 0x05 | ||
| 256 | #define HCI_LK_CHANGED_COMBINATION 0x06 | ||
| 257 | |||
| 249 | /* ----- HCI Commands ---- */ | 258 | /* ----- HCI Commands ---- */ |
| 250 | #define HCI_OP_NOP 0x0000 | 259 | #define HCI_OP_NOP 0x0000 |
| 251 | 260 | ||