2 files changed, 56 insertions, 59 deletions

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 36e68b4551af..7e3d38bfaec3 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -184,7 +184,6 @@ struct mgmt_cp_disconnect {
 } __packed;
 struct mgmt_rp_disconnect {
         struct mgmt_addr_info addr;
-        __u8 status;
 } __packed;
 
 #define MGMT_OP_GET_CONNECTIONS         0x0015
@@ -201,7 +200,6 @@ struct mgmt_cp_pin_code_reply {
 } __packed;
 struct mgmt_rp_pin_code_reply {
         struct mgmt_addr_info addr;
-        uint8_t status;
 } __packed;
 
 #define MGMT_OP_PIN_CODE_NEG_REPLY      0x0017
@@ -221,7 +219,6 @@ struct mgmt_cp_pair_device {
 } __packed;
 struct mgmt_rp_pair_device {
         struct mgmt_addr_info addr;
-        __u8 status;
 } __packed;
 
 #define MGMT_OP_CANCEL_PAIR_DEVICE      0x001A
@@ -233,7 +230,6 @@ struct mgmt_cp_unpair_device {
 } __packed;
 struct mgmt_rp_unpair_device {
         struct mgmt_addr_info addr;
-        __u8 status;
 };
 
 #define MGMT_OP_USER_CONFIRM_REPLY      0x001C
@@ -242,7 +238,6 @@ struct mgmt_cp_user_confirm_reply {
 } __packed;
 struct mgmt_rp_user_confirm_reply {
         struct mgmt_addr_info addr;
-        __u8 status;
 } __packed;
 
 #define MGMT_OP_USER_CONFIRM_NEG_REPLY  0x001D
@@ -257,7 +252,6 @@ struct mgmt_cp_user_passkey_reply {
 } __packed;
 struct mgmt_rp_user_passkey_reply {
         struct mgmt_addr_info addr;
-        __u8 status;
 } __packed;
 
 #define MGMT_OP_USER_PASSKEY_NEG_REPLY  0x001F
@@ -297,7 +291,6 @@ struct mgmt_cp_confirm_name {
 } __packed;
 struct mgmt_rp_confirm_name {
         struct mgmt_addr_info addr;
-        __u8 status;
 } __packed;
 
 #define MGMT_OP_BLOCK_DEVICE            0x0026
@@ -313,6 +306,7 @@ struct mgmt_cp_unblock_device {
 #define MGMT_EV_CMD_COMPLETE            0x0001
 struct mgmt_ev_cmd_complete {
         __le16 opcode;
+        __u8 status;
         __u8 data[0];
 } __packed;
 
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 89754bbcd02b..61d0250bd77e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -227,8 +227,8 @@ static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
         return err;
 }
 
-static int cmd_complete(struct sock *sk, u16 index, u16 cmd, void *rp,
-                                                                size_t rp_len)
+static int cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,
+                                                void *rp, size_t rp_len)
 {
         struct sk_buff *skb;
         struct mgmt_hdr *hdr;
@@ -249,6 +249,7 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, void *rp,
 
         ev = (void *) skb_put(skb, sizeof(*ev) + rp_len);
         put_unaligned_le16(cmd, &ev->opcode);
+        ev->status = status;
 
         if (rp)
                 memcpy(ev->data, rp, rp_len);
@@ -269,7 +270,7 @@ static int read_version(struct sock *sk)
         rp.version = MGMT_VERSION;
         put_unaligned_le16(MGMT_REVISION, &rp.revision);
 
-        return cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, &rp,
+        return cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, 0, &rp,
                                                                 sizeof(rp));
 }
 
@@ -299,7 +300,7 @@ static int read_commands(struct sock *sk)
         for (i = 0; i < num_events; i++, opcode++)
                 put_unaligned_le16(mgmt_events[i], opcode);
 
-        err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_COMMANDS, rp,
+        err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_COMMANDS, 0, rp,
                                                                 rp_size);
         kfree(rp);
 
@@ -347,7 +348,7 @@ static int read_index_list(struct sock *sk)
 
         read_unlock(&hci_dev_list_lock);
 
-        err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_INDEX_LIST, rp,
+        err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_INDEX_LIST, 0, rp,
                                                                         rp_len);
 
         kfree(rp);
@@ -637,7 +638,7 @@ static int read_controller_info(struct sock *sk, u16 index)
         hci_dev_unlock(hdev);
         hci_dev_put(hdev);
 
-        return cmd_complete(sk, index, MGMT_OP_READ_INFO, &rp, sizeof(rp));
+        return cmd_complete(sk, index, MGMT_OP_READ_INFO, 0, &rp, sizeof(rp));
 }
 
 static void mgmt_pending_free(struct pending_cmd *cmd)
@@ -717,7 +718,8 @@ static int send_settings_rsp(struct sock *sk, u16 opcode, struct hci_dev *hdev)
 {
         __le32 settings = cpu_to_le32(get_current_settings(hdev));
 
-        return cmd_complete(sk, hdev->id, opcode, &settings, sizeof(settings));
+        return cmd_complete(sk, hdev->id, opcode, 0, &settings,
+                                                        sizeof(settings));
 }
 
 static int set_powered(struct sock *sk, u16 index, void *data, u16 len)
@@ -1124,7 +1126,7 @@ static int add_uuid(struct sock *sk, u16 index, void *data, u16 len)
         if (err < 0)
                 goto failed;
 
-        err = cmd_complete(sk, index, MGMT_OP_ADD_UUID, NULL, 0);
+        err = cmd_complete(sk, index, MGMT_OP_ADD_UUID, 0, NULL, 0);
 
 failed:
         hci_dev_unlock(hdev);
@@ -1185,7 +1187,7 @@ static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
         if (err < 0)
                 goto unlock;
 
-        err = cmd_complete(sk, index, MGMT_OP_REMOVE_UUID, NULL, 0);
+        err = cmd_complete(sk, index, MGMT_OP_REMOVE_UUID, 0, NULL, 0);
 
 unlock:
         hci_dev_unlock(hdev);
@@ -1226,7 +1228,8 @@ static int set_dev_class(struct sock *sk, u16 index, void *data, u16 len)
         err = update_class(hdev);
 
         if (err == 0)
-                err = cmd_complete(sk, index, MGMT_OP_SET_DEV_CLASS, NULL, 0);
+                err = cmd_complete(sk, index, MGMT_OP_SET_DEV_CLASS, 0,
+                                                                NULL, 0);
 
         hci_dev_unlock(hdev);
         hci_dev_put(hdev);
@@ -1282,7 +1285,7 @@ static int load_link_keys(struct sock *sk, u16 index, void *data, u16 len)