Bluetooth: mgmt: Add address type to confirm name command

The latest mgmt API includes an address type for all messages containing
an address. This patch updates the confirm name command to match this.

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

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index eb584cc287d6cea9577e6af37c9c3517788fca18..14c1816cac6782b59e15e5e94333e831e3a5a9f7 100644 (file)
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -296,11 +296,11 @@ struct mgmt_cp_start_discovery {
 
 #define MGMT_OP_CONFIRM_NAME           0x0025
 struct mgmt_cp_confirm_name {
-       bdaddr_t bdaddr;
+       struct mgmt_addr_info addr;
        __u8 name_known;
 } __packed;
 struct mgmt_rp_confirm_name {
-       bdaddr_t bdaddr;
+       struct mgmt_addr_info addr;
        __u8 status;
 } __packed;
 

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 68623401933f297e82482915b7ff941fde5cc7ee..01c8d6239a4b087e6975c2df6dc1de285ae6aa05 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2299,7 +2299,7 @@ static int confirm_name(struct sock *sk, u16 index, void *data, u16 len)
                goto failed;
        }
 
-       e = hci_inquiry_cache_lookup_unknown(hdev, &cp->bdaddr);
+       e = hci_inquiry_cache_lookup_unknown(hdev, &cp->addr.bdaddr);
        if (!e) {
                err = cmd_status (sk, index, MGMT_OP_CONFIRM_NAME,
                                MGMT_STATUS_INVALID_PARAMS);