openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-12-05 13:36:05 +02:00 committed by Marcel Holtmann
parent 04ab2749ea
commit d8b7b1e49a
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/bluetooth/mgmt.c
View File

@ -2821,6 +2821,8 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,
goto unlock; goto unlock;
} }
cmd->cmd_complete = addr_cmd_complete;
dc.handle = cpu_to_le16(conn->handle); dc.handle = cpu_to_le16(conn->handle);
dc.reason = 0x13; /* Remote User Terminated Connection */ dc.reason = 0x13; /* Remote User Terminated Connection */
err = hci_send_cmd(hdev, HCI_OP_DISCONNECT, sizeof(dc), &dc); 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 hci_dev *hdev = data;
struct mgmt_cp_unpair_device *cp = cmd->param; 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); 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); mgmt_pending_remove(cmd);
} }