Skip to content

Commit

Permalink
Bluetooth: mgmt: Fix Pair Device response status values
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johan Hedberg committed Feb 19, 2012
1 parent aee9b21 commit e211326
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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("");
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit e211326

Please sign in to comment.