GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-07 07:05:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bluetooth: Fix mgmt_pin_code_reply return parameters

Browse source 
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: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Johan Hedberg 2011-02-19 12:05:59 -03:00 • committed by Gustavo F. Padovan
parent 59a24b5d0d
commit ac56fb13c0
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/net/bluetooth/mgmt.h
View file

@ -147,6 +147,11 @@ struct mgmt_cp_pin_code_reply {
__u8 pin_len; __u8 pin_len;
__u8 pin_code[16]; __u8 pin_code[16];
} __packed; } __packed;
struct mgmt_rp_pin_code_reply {
__le16 index;
bdaddr_t bdaddr;
uint8_t status;
} __packed;
#define MGMT_OP_PIN_CODE_NEG_REPLY 0x0012 #define MGMT_OP_PIN_CODE_NEG_REPLY 0x0012
struct mgmt_cp_pin_code_neg_reply { struct mgmt_cp_pin_code_neg_reply {

23
net/bluetooth/mgmt.c
View file

@ -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) int mgmt_pin_code_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status)
{ {
struct pending_cmd *cmd; struct pending_cmd *cmd;
struct mgmt_rp_pin_code_reply rp;
int err; int err;
cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_REPLY, index); cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_REPLY, index);
if (!cmd) if (!cmd)
return -ENOENT; return -ENOENT;
if (status != 0) put_unaligned_le16(index, &rp.index);
err = cmd_status(cmd->sk, MGMT_OP_PIN_CODE_REPLY, status); bacpy(&rp.bdaddr, bdaddr);
else rp.status = status;
err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_REPLY,
bdaddr, sizeof(*bdaddr)); err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_REPLY, &rp, sizeof(rp));
list_del(&cmd->list); list_del(&cmd->list);
mgmt_pending_free(cmd); 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) int mgmt_pin_code_neg_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status)
{ {
struct pending_cmd *cmd; struct pending_cmd *cmd;
struct mgmt_rp_pin_code_reply rp;
int err; int err;
cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_NEG_REPLY, index); cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_NEG_REPLY, index);
if (!cmd) if (!cmd)
return -ENOENT; return -ENOENT;
if (status != 0) put_unaligned_le16(index, &rp.index);
err = cmd_status(cmd->sk, MGMT_OP_PIN_CODE_NEG_REPLY, status); bacpy(&rp.bdaddr, bdaddr);
else rp.status = status;
err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_NEG_REPLY,
bdaddr, sizeof(*bdaddr)); err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_NEG_REPLY,
&rp, sizeof(rp));
list_del(&cmd->list); list_del(&cmd->list);
mgmt_pending_free(cmd); mgmt_pending_free(cmd);