Bluetooth: Add address type to user_confirm and user_passkey messages

This patch upadate the user confirm and user passkey mgmt messages to
match the latest API specification by adding an address type parameter
to them.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

2 files changed, 18 insertions, 16 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 634a0cdcdad6..5f27694068f2 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -968,16 +968,18 @@ int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
 int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
                                                                 u8 status);
 int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                                __le32 value, u8 confirm_hint);
+                                u8 link_type, u8 addr_type, __le32 value,
+                                u8 confirm_hint);
 int mgmt_user_confirm_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                                                u8 status);
-int mgmt_user_confirm_neg_reply_complete(struct hci_dev *hdev,
-                                                bdaddr_t *bdaddr, u8 status);
-int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr);
+                                        u8 link_type, u8 addr_type, u8 status);
+int mgmt_user_confirm_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
+                                        u8 link_type, u8 addr_type, u8 status);
+int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr,
+                                                u8 link_type, u8 addr_type);
 int mgmt_user_passkey_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                                                u8 status);
-int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev,
-                                                bdaddr_t *bdaddr, u8 status);
+                                        u8 link_type, u8 addr_type, u8 status);
+int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
+                                        u8 link_type, u8 addr_type, u8 status);
 int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 status);
 int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);
 int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 735e547e3448..378d498896b3 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -235,31 +235,31 @@ struct mgmt_rp_unpair_device {
 
 #define MGMT_OP_USER_CONFIRM_REPLY      0x001C
 struct mgmt_cp_user_confirm_reply {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
 } __packed;
 struct mgmt_rp_user_confirm_reply {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
         __u8 status;
 } __packed;
 
 #define MGMT_OP_USER_CONFIRM_NEG_REPLY  0x001D
 struct mgmt_cp_user_confirm_neg_reply {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
 } __packed;
 
 #define MGMT_OP_USER_PASSKEY_REPLY      0x001E
 struct mgmt_cp_user_passkey_reply {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
         __le32 passkey;
 } __packed;
 struct mgmt_rp_user_passkey_reply {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
         __u8 status;
 } __packed;
 
 #define MGMT_OP_USER_PASSKEY_NEG_REPLY  0x001F
 struct mgmt_cp_user_passkey_neg_reply {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
 } __packed;
 
 #define MGMT_OP_READ_LOCAL_OOB_DATA     0x0020
@@ -376,14 +376,14 @@ struct mgmt_ev_pin_code_request {
 
 #define MGMT_EV_USER_CONFIRM_REQUEST    0x000F
 struct mgmt_ev_user_confirm_request {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
         __u8 confirm_hint;
         __le32 value;
 } __packed;
 
 #define MGMT_EV_USER_PASSKEY_REQUEST    0x0010
 struct mgmt_ev_user_passkey_request {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
 } __packed;
 
 #define MGMT_EV_AUTH_FAILED             0x0011