Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 664ce4cc authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: Add address type to Out Of Band mgmt messages 



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: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 272d90df

include/net/bluetooth/mgmt.h

+2 −2
Original line number Diff line number Diff line
@@ -270,14 +270,14 @@ struct mgmt_rp_read_local_oob_data { 


#define MGMT_OP_ADD_REMOTE_OOB_DATA	0x0021

struct mgmt_cp_add_remote_oob_data {

	bdaddr_t bdaddr;

	struct mgmt_addr_info addr;

	__u8 hash[16];

	__u8 randomizer[16];

} __packed;



#define MGMT_OP_REMOVE_REMOTE_OOB_DATA	0x0022

struct mgmt_cp_remove_remote_oob_data {

	bdaddr_t bdaddr;

	struct mgmt_addr_info addr;

} __packed;



#define MGMT_OP_START_DISCOVERY		0x0023

net/bluetooth/mgmt.c

+2 −2
Original line number Diff line number Diff line
@@ -1875,7 +1875,7 @@ static int add_remote_oob_data(struct sock *sk, u16 index, void *data, 


	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);

	if (err < 0)

		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);



	err = hci_remove_remote_oob_data(hdev, &cp->bdaddr);

	err = hci_remove_remote_oob_data(hdev, &cp->addr.bdaddr);

	if (err < 0)

		err = cmd_status(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA,

						MGMT_STATUS_INVALID_PARAMS);