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

Commit 66f096f7 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Remove mgmt_rp_read_local_oob_ext_data struct 



This extended return parameters struct conflicts with the new Read Local
OOB Extended Data command definition. To avoid the conflict simply
rename the old "extended" version to the normal one and update the code
appropriately to take into account the two possible response PDU sizes.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b970c5ba

include/net/bluetooth/mgmt.h

+0 −4
Original line number Diff line number Diff line
@@ -301,10 +301,6 @@ struct mgmt_cp_user_passkey_neg_reply { 
#define MGMT_OP_READ_LOCAL_OOB_DATA	0x0020

#define MGMT_READ_LOCAL_OOB_DATA_SIZE	0

struct mgmt_rp_read_local_oob_data {

	__u8	hash[16];

	__u8	rand[16];

} __packed;

struct mgmt_rp_read_local_oob_ext_data {

	__u8	hash192[16];

	__u8	rand192[16];

	__u8	hash256[16];

net/bluetooth/mgmt.c

+9 −16
Original line number Diff line number Diff line
@@ -7168,28 +7168,21 @@ void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192, 
		cmd_status(cmd->sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_DATA,

			   mgmt_status(status));

	} else {

		if (bredr_sc_enabled(hdev) && hash256 && rand256) {

			struct mgmt_rp_read_local_oob_ext_data rp;

		struct mgmt_rp_read_local_oob_data rp;

		size_t rp_size = sizeof(rp);



		memcpy(rp.hash192, hash192, sizeof(rp.hash192));

		memcpy(rp.rand192, rand192, sizeof(rp.rand192));



		if (bredr_sc_enabled(hdev) && hash256 && rand256) {

			memcpy(rp.hash256, hash256, sizeof(rp.hash256));

			memcpy(rp.rand256, rand256, sizeof(rp.rand256));



			cmd_complete(cmd->sk, hdev->id,

				     MGMT_OP_READ_LOCAL_OOB_DATA, 0,

				     &rp, sizeof(rp));

		} else {

			struct mgmt_rp_read_local_oob_data rp;



			memcpy(rp.hash, hash192, sizeof(rp.hash));

			memcpy(rp.rand, rand192, sizeof(rp.rand));



			cmd_complete(cmd->sk, hdev->id,

				     MGMT_OP_READ_LOCAL_OOB_DATA, 0,

				     &rp, sizeof(rp));

			rp_size -= sizeof(rp.hash256) + sizeof(rp.rand256);

		}



		cmd_complete(cmd->sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_DATA, 0,

			     &rp, rp_size);

	}



	mgmt_pending_remove(cmd);