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

Commit ac56fb13 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix mgmt_pin_code_reply return parameters



The command complete event for mgmt_pin_code_reply &
mgmt_pin_code_neg_reply should have the adapter index, Bluetooth address
as well as the status.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 59a24b5d
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -147,6 +147,11 @@ struct mgmt_cp_pin_code_reply {
	__u8 pin_len;
	__u8 pin_code[16];
} __packed;
struct mgmt_rp_pin_code_reply {
	__le16 index;
	bdaddr_t bdaddr;
	uint8_t status;
} __packed;

#define MGMT_OP_PIN_CODE_NEG_REPLY	0x0012
struct mgmt_cp_pin_code_neg_reply {
+13 −10
Original line number Diff line number Diff line
@@ -1558,17 +1558,18 @@ int mgmt_pin_code_request(u16 index, bdaddr_t *bdaddr)
int mgmt_pin_code_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status)
{
	struct pending_cmd *cmd;
	struct mgmt_rp_pin_code_reply rp;
	int err;

	cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_REPLY, index);
	if (!cmd)
		return -ENOENT;

	if (status != 0)
		err = cmd_status(cmd->sk, MGMT_OP_PIN_CODE_REPLY, status);
	else
		err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_REPLY,
						bdaddr, sizeof(*bdaddr));
	put_unaligned_le16(index, &rp.index);
	bacpy(&rp.bdaddr, bdaddr);
	rp.status = status;

	err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_REPLY, &rp, sizeof(rp));

	list_del(&cmd->list);
	mgmt_pending_free(cmd);
@@ -1579,17 +1580,19 @@ int mgmt_pin_code_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status)
int mgmt_pin_code_neg_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status)
{
	struct pending_cmd *cmd;
	struct mgmt_rp_pin_code_reply rp;
	int err;

	cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_NEG_REPLY, index);
	if (!cmd)
		return -ENOENT;

	if (status != 0)
		err = cmd_status(cmd->sk, MGMT_OP_PIN_CODE_NEG_REPLY, status);
	else
	put_unaligned_le16(index, &rp.index);
	bacpy(&rp.bdaddr, bdaddr);
	rp.status = status;

	err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_NEG_REPLY,
						bdaddr, sizeof(*bdaddr));
							&rp, sizeof(rp));

	list_del(&cmd->list);
	mgmt_pending_free(cmd);