提交 e211326c 编写于 作者: J Johan Hedberg

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: NJohan Hedberg <johan.hedberg@intel.com>
Acked-by: NMarcel Holtmann <marcel@holtmann.org>
上级 aee9b218
...@@ -1728,7 +1728,7 @@ static void pairing_complete_cb(struct hci_conn *conn, u8 status) ...@@ -1728,7 +1728,7 @@ static void pairing_complete_cb(struct hci_conn *conn, u8 status)
if (!cmd) if (!cmd)
BT_DBG("Unable to find a pending command"); BT_DBG("Unable to find a pending command");
else else
pairing_complete(cmd, status); pairing_complete(cmd, mgmt_status(status));
} }
static int pair_device(struct sock *sk, u16 index, void *data, u16 len) 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) ...@@ -1739,7 +1739,6 @@ static int pair_device(struct sock *sk, u16 index, void *data, u16 len)
struct pending_cmd *cmd; struct pending_cmd *cmd;
u8 sec_level, auth_type; u8 sec_level, auth_type;
struct hci_conn *conn; struct hci_conn *conn;
u8 status = 0;
int err; int err;
BT_DBG(""); BT_DBG("");
...@@ -1773,17 +1772,16 @@ static int pair_device(struct sock *sk, u16 index, void *data, u16 len) ...@@ -1773,17 +1772,16 @@ static int pair_device(struct sock *sk, u16 index, void *data, u16 len)
rp.addr.type = cp->addr.type; rp.addr.type = cp->addr.type;
if (IS_ERR(conn)) { if (IS_ERR(conn)) {
status = -PTR_ERR(conn); err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE,
err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE, status, MGMT_STATUS_CONNECT_FAILED,
&rp, sizeof(rp)); &rp, sizeof(rp));
goto unlock; goto unlock;
} }
if (conn->connect_cfm_cb) { if (conn->connect_cfm_cb) {
hci_conn_put(conn); hci_conn_put(conn);
status = EBUSY; err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE,
err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE, status, MGMT_STATUS_BUSY, &rp, sizeof(rp));
&rp, sizeof(rp));
goto unlock; goto unlock;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册