diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-17 14:27:06 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-17 14:39:16 +0200 |
| commit | a198e7b100b26dd6ac0240487ca37bad0f53e3e6 (patch) | |
| tree | 9389498822eda64c2f1a6bc71093572fadb658cb | |
| parent | d8457698e7f23a05055396a15ec72ba663282867 (diff) | |
| download | linux-a198e7b100b26dd6ac0240487ca37bad0f53e3e6.tar.gz linux-a198e7b100b26dd6ac0240487ca37bad0f53e3e6.tar.bz2 linux-a198e7b100b26dd6ac0240487ca37bad0f53e3e6.zip | |
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>
| -rw-r--r-- | include/net/bluetooth/mgmt.h | 4 | ||||
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index eb584cc287d6..14c1816cac67 100644 --- 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 68623401933f..01c8d6239a4b 100644 --- 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); |