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

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

Bluetooth: Convert Unpair Device to use cmd_complete callback 



This patch updates the Unpair Device code to take advantage of the
cmd_complete callback of struct pending_cmd.

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

net/bluetooth/mgmt.c

+3 −7
Original line number Diff line number Diff line
@@ -2821,6 +2821,8 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
		goto unlock;

	}



	cmd->cmd_complete = addr_cmd_complete;



	dc.handle = cpu_to_le16(conn->handle);

	dc.reason = 0x13; /* Remote User Terminated Connection */

	err = hci_send_cmd(hdev, HCI_OP_DISCONNECT, sizeof(dc), &dc);
@@ -6430,16 +6432,10 @@ static void unpair_device_rsp(struct pending_cmd *cmd, void *data) 
{

	struct hci_dev *hdev = data;

	struct mgmt_cp_unpair_device *cp = cmd->param;

	struct mgmt_rp_unpair_device rp;



	memset(&rp, 0, sizeof(rp));

	bacpy(&rp.addr.bdaddr, &cp->addr.bdaddr);

	rp.addr.type = cp->addr.type;



	device_unpaired(hdev, &cp->addr.bdaddr, cp->addr.type, cmd->sk);



	cmd_complete(cmd->sk, cmd->index, cmd->opcode, 0, &rp, sizeof(rp));



	cmd->cmd_complete(cmd, 0);

	mgmt_pending_remove(cmd);

}