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

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

Bluetooth: Use hci_disconnect() for mgmt_disconnect_device() 



There's no reason to custom build the HCI_Disconnect command in the
Disconnect Device mgmt command handler. This patch updates the code to
use hci_disconnect() instead.

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

net/bluetooth/mgmt.c

+1 −5
Original line number Diff line number Diff line
@@ -2788,7 +2788,6 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, 
{

	struct mgmt_cp_disconnect *cp = data;

	struct mgmt_rp_disconnect rp;

	struct hci_cp_disconnect dc;

	struct pending_cmd *cmd;

	struct hci_conn *conn;

	int err;
@@ -2836,10 +2835,7 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, 
		goto failed;

	}



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

	dc.reason = HCI_ERROR_REMOTE_USER_TERM;



	err = hci_send_cmd(hdev, HCI_OP_DISCONNECT, sizeof(dc), &dc);

	err = hci_disconnect(conn, HCI_ERROR_REMOTE_USER_TERM);

	if (err < 0)

		mgmt_pending_remove(cmd);