diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-18 20:33:33 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-09-08 19:07:55 +0200 |
| commit | e3f2f92a047cd2be3c87a2aaf0a8958e1fd4c17a (patch) | |
| tree | 843217afaf839520687b9ce8de302e53a563799d | |
| parent | e3b679d56caa2bc555dee646a6ac5861631e7a28 (diff) | |
| download | blackbird-op-linux-e3f2f92a047cd2be3c87a2aaf0a8958e1fd4c17a.tar.gz blackbird-op-linux-e3f2f92a047cd2be3c87a2aaf0a8958e1fd4c17a.zip | |
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index d8c66663ade8..ab9521ae3c63 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -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); |
