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

Commit 3edaf092 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Gustavo Padovan
Browse files

Bluetooth: Make mgmt_read_local_oob_data_reply_complete() return void 



The return value of mgmt_read_local_oob_data_reply_complete() function
is not used and so just change it to return void.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 7667da34

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); 
void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,

				    u8 status);

void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);

int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,

void mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,

					     u8 *randomizer, u8 status);

void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

		       u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name,

net/bluetooth/mgmt.c

+7 −11
Original line number Diff line number Diff line
@@ -4840,20 +4840,19 @@ void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status) 
		   cmd ? cmd->sk : NULL);

}



int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,

void mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,

					     u8 *randomizer, u8 status)

{

	struct pending_cmd *cmd;

	int err;



	BT_DBG("%s status %u", hdev->name, status);



	cmd = mgmt_pending_find(MGMT_OP_READ_LOCAL_OOB_DATA, hdev);

	if (!cmd)

		return -ENOENT;

		return;



	if (status) {

		err = cmd_status(cmd->sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_DATA,

		cmd_status(cmd->sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_DATA,

			   mgmt_status(status));

	} else {

		struct mgmt_rp_read_local_oob_data rp;
@@ -4861,14 +4860,11 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, 
		memcpy(rp.hash, hash, sizeof(rp.hash));

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



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

				   MGMT_OP_READ_LOCAL_OOB_DATA, 0, &rp,

				   sizeof(rp));

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

			     0, &rp, sizeof(rp));

	}



	mgmt_pending_remove(cmd);



	return err;

}



void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,