diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-13 23:35:35 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-13 23:35:35 +0400 |
| commit | 211c17aaee644bb808fbdeef547ac99db92c01ed (patch) | |
| tree | 2acf7fe32b30f537b06fed7e4c536ef0d11f2902 /include/net/bluetooth | |
| parent | ec8eb9ae5819da011ac574aa290207a2a47cdbae (diff) | |
| parent | bcb7ad7bcbef030e6ba71ede1f9866368aca7c99 (diff) | |
| download | linux-211c17aaee644bb808fbdeef547ac99db92c01ed.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/main.c
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; |