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: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 52376a3..5aee200 100644 (file)
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -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 {

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index d1d9b8c..0d3d613 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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
-               err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_NEG_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_NEG_REPLY,
+                                                       &rp, sizeof(rp));
 
        list_del(&cmd->list);
        mgmt_pending_free(cmd);