1 files changed, 45 insertions, 4 deletions

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 3e320c9cae8f..3b6880690a78 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -23,6 +23,23 @@
 
 #define MGMT_INDEX_NONE                 0xFFFF
 
+#define MGMT_STATUS_SUCCESS             0x00
+#define MGMT_STATUS_UNKNOWN_COMMAND     0x01
+#define MGMT_STATUS_NOT_CONNECTED       0x02
+#define MGMT_STATUS_FAILED              0x03
+#define MGMT_STATUS_CONNECT_FAILED      0x04
+#define MGMT_STATUS_AUTH_FAILED         0x05
+#define MGMT_STATUS_NOT_PAIRED          0x06
+#define MGMT_STATUS_NO_RESOURCES        0x07
+#define MGMT_STATUS_TIMEOUT             0x08
+#define MGMT_STATUS_ALREADY_CONNECTED   0x09
+#define MGMT_STATUS_BUSY                0x0a
+#define MGMT_STATUS_REJECTED            0x0b
+#define MGMT_STATUS_NOT_SUPPORTED       0x0c
+#define MGMT_STATUS_INVALID_PARAMS      0x0d
+#define MGMT_STATUS_DISCONNECTED        0x0e
+#define MGMT_STATUS_NOT_POWERED         0x0f
+
 struct mgmt_hdr {
         __le16 opcode;
         __le16 index;
@@ -119,6 +136,10 @@ struct mgmt_cp_remove_keys {
         bdaddr_t bdaddr;
         __u8 disconnect;
 } __packed;
+struct mgmt_rp_remove_keys {
+        bdaddr_t bdaddr;
+        __u8 status;
+};
 
 #define MGMT_OP_DISCONNECT              0x000F
 struct mgmt_cp_disconnect {
@@ -126,11 +147,12 @@ struct mgmt_cp_disconnect {
 } __packed;
 struct mgmt_rp_disconnect {
         bdaddr_t bdaddr;
+        __u8 status;
 } __packed;
 
 #define MGMT_ADDR_BREDR                 0x00
-#define MGMT_ADDR_LE                    0x01
-#define MGMT_ADDR_BREDR_LE              0x02
+#define MGMT_ADDR_LE_PUBLIC             0x01
+#define MGMT_ADDR_LE_RANDOM             0x02
 #define MGMT_ADDR_INVALID               0xff
 
 struct mgmt_addr_info {
@@ -167,11 +189,11 @@ struct mgmt_cp_set_io_capability {
 
 #define MGMT_OP_PAIR_DEVICE             0x0014
 struct mgmt_cp_pair_device {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
         __u8 io_cap;
 } __packed;
 struct mgmt_rp_pair_device {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
         __u8 status;
 } __packed;
 
@@ -210,6 +232,9 @@ struct mgmt_cp_remove_remote_oob_data {
 } __packed;
 
 #define MGMT_OP_START_DISCOVERY         0x001B
+struct mgmt_cp_start_discovery {
+        __u8 type;
+} __packed;
 
 #define MGMT_OP_STOP_DISCOVERY          0x001C
 
@@ -228,6 +253,17 @@ struct mgmt_cp_set_fast_connectable {
         __u8 enable;
 } __packed;
 
+#define MGMT_OP_USER_PASSKEY_REPLY      0x0020
+struct mgmt_cp_user_passkey_reply {
+        bdaddr_t bdaddr;
+        __le32 passkey;
+} __packed;
+
+#define MGMT_OP_USER_PASSKEY_NEG_REPLY  0x0021
+struct mgmt_cp_user_passkey_neg_reply {
+        bdaddr_t bdaddr;
+} __packed;
+
 #define MGMT_EV_CMD_COMPLETE            0x0001
 struct mgmt_ev_cmd_complete {
         __le16 opcode;
@@ -322,3 +358,8 @@ struct mgmt_ev_device_blocked {
 struct mgmt_ev_device_unblocked {
         bdaddr_t bdaddr;
 } __packed;
+
+#define MGMT_EV_USER_PASSKEY_REQUEST    0x0017
+struct mgmt_ev_user_passkey_request {
+        bdaddr_t bdaddr;
+} __packed;