Bluetooth: mgmt: Fix Pair Device response status values

This patch fixes the status in Pair Device responses to follow proper
mgmt status values.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 61d0250bd77e0aa139e945603a50cc603e8b7176..79255f536278ccdb9670844e7efe337cb0c508b9 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1728,7 +1728,7 @@ static void pairing_complete_cb(struct hci_conn *conn, u8 status)
        if (!cmd)
                BT_DBG("Unable to find a pending command");
        else
-               pairing_complete(cmd, status);
+               pairing_complete(cmd, mgmt_status(status));
 }
 
 static int pair_device(struct sock *sk, u16 index, void *data, u16 len)
@@ -1739,7 +1739,6 @@ static int pair_device(struct sock *sk, u16 index, void *data, u16 len)
        struct pending_cmd *cmd;
        u8 sec_level, auth_type;
        struct hci_conn *conn;
-       u8 status = 0;
        int err;
 
        BT_DBG("");
@@ -1773,17 +1772,16 @@ static int pair_device(struct sock *sk, u16 index, void *data, u16 len)
        rp.addr.type = cp->addr.type;
 
        if (IS_ERR(conn)) {
-               status = -PTR_ERR(conn);
-               err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE, status,
-                                                       &rp, sizeof(rp));
+               err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE,
+                                               MGMT_STATUS_CONNECT_FAILED,
+                                               &rp, sizeof(rp));
                goto unlock;
        }
 
        if (conn->connect_cfm_cb) {
                hci_conn_put(conn);
-               status = EBUSY;
-               err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE, status,
-                                                       &rp, sizeof(rp));
+               err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE,
+                                       MGMT_STATUS_BUSY, &rp, sizeof(rp));
                goto unlock;
        }