Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 17 insertions, 0 deletions

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index a5f8c4684a32..ec6acf2f1c0b 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -415,6 +415,17 @@ struct hci_cp_io_capability_reply {
         __u8     authentication;
 } __packed;
 
+#define HCI_OP_USER_CONFIRM_REPLY               0x042c
+struct hci_cp_user_confirm_reply {
+        bdaddr_t bdaddr;
+} __packed;
+struct hci_rp_user_confirm_reply {
+        __u8     status;
+        bdaddr_t bdaddr;
+} __packed;
+
+#define HCI_OP_USER_CONFIRM_NEG_REPLY   0x042d
+
 #define HCI_OP_IO_CAPABILITY_NEG_REPLY  0x0434
 struct hci_cp_io_capability_neg_reply {
         bdaddr_t bdaddr;
@@ -936,6 +947,12 @@ struct hci_ev_io_capa_reply {
         __u8     authentication;
 } __packed;
 
+#define HCI_EV_USER_CONFIRM_REQUEST     0x33
+struct hci_ev_user_confirm_req {
+        bdaddr_t        bdaddr;
+        __le32          passkey;
+} __packed;
+
 #define HCI_EV_SIMPLE_PAIR_COMPLETE     0x36
 struct hci_ev_simple_pair_complete {
         __u8     status;