Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 23:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: Add address type to Out Of Band mgmt messages

Browse Source 
This patch updates the implementation for these mgmt to be up to date
with the latest API specification. Right now the address type isn't
actually used for anything but that might change in the future.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2012-02-09 15:44:09 +02:00
parent 272d90df2d
commit 664ce4cc29
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/bluetooth/mgmt.h
View File

@ -270,14 +270,14 @@ struct mgmt_rp_read_local_oob_data {
#define MGMT_OP_ADD_REMOTE_OOB_DATA 0x0021 #define MGMT_OP_ADD_REMOTE_OOB_DATA 0x0021
struct mgmt_cp_add_remote_oob_data { struct mgmt_cp_add_remote_oob_data {
bdaddr_t bdaddr; struct mgmt_addr_info addr;
__u8 hash[16]; __u8 hash[16];
__u8 randomizer[16]; __u8 randomizer[16];
} __packed; } __packed;
#define MGMT_OP_REMOVE_REMOTE_OOB_DATA 0x0022 #define MGMT_OP_REMOVE_REMOTE_OOB_DATA 0x0022
struct mgmt_cp_remove_remote_oob_data { struct mgmt_cp_remove_remote_oob_data {
bdaddr_t bdaddr; struct mgmt_addr_info addr;
} __packed; } __packed;
#define MGMT_OP_START_DISCOVERY 0x0023 #define MGMT_OP_START_DISCOVERY 0x0023

4
net/bluetooth/mgmt.c
View File

@ -1875,7 +1875,7 @@ static int add_remote_oob_data(struct sock *sk, u16 index, void *data,
hci_dev_lock(hdev); hci_dev_lock(hdev);
err = hci_add_remote_oob_data(hdev, &cp->bdaddr, cp->hash, err = hci_add_remote_oob_data(hdev, &cp->addr.bdaddr, cp->hash,
cp->randomizer); cp->randomizer);
if (err < 0) if (err < 0)
err = cmd_status(sk, index, MGMT_OP_ADD_REMOTE_OOB_DATA, err = cmd_status(sk, index, MGMT_OP_ADD_REMOTE_OOB_DATA,
@ -1910,7 +1910,7 @@ static int remove_remote_oob_data(struct sock *sk, u16 index,
hci_dev_lock(hdev); hci_dev_lock(hdev);
err = hci_remove_remote_oob_data(hdev, &cp->bdaddr); err = hci_remove_remote_oob_data(hdev, &cp->addr.bdaddr);
if (err < 0) if (err < 0)
err = cmd_status(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA, err = cmd_status(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
MGMT_STATUS_INVALID_PARAMS); MGMT_STATUS_INVALID_PARAMS);