diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-11 22:36:42 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-11 22:36:42 -0300 |
| commit | cbe461c526e1e0f8b55f91180df64f02d8daed45 (patch) | |
| tree | e0d785c63d550d81cb42960ac490aebef4bc965c /include/net/bluetooth | |
| parent | 1d0c4da8f717937aeda47a72bc769d80f8776795 (diff) | |
| parent | 1c2e004183178e1947882cd2e74f37826f45230e (diff) | |
| download | blackbird-op-linux-cbe461c526e1e0f8b55f91180df64f02d8daed45.tar.gz blackbird-op-linux-cbe461c526e1e0f8b55f91180df64f02d8daed45.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts:
net/bluetooth/hci_event.c
Diffstat (limited to 'include/net/bluetooth')
| -rw-r--r-- | include/net/bluetooth/hci.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 3f5d682e866f..2a6b0b8b7120 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -1195,6 +1195,12 @@ struct extended_inquiry_info { __u8 data[240]; } __packed; +#define HCI_EV_KEY_REFRESH_COMPLETE 0x30 +struct hci_ev_key_refresh_complete { + __u8 status; + __le16 handle; +} __packed; + #define HCI_EV_IO_CAPA_REQUEST 0x31 struct hci_ev_io_capa_request { bdaddr_t bdaddr; |
