mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 16:54:20 +08:00
Bluetooth: Rename cmd_complete() to mgmt_cmd_complete()
This patch renames the cmd_complete() function to mgmt_cmd_complete() in preparation of making it a generic helper for other modules to use too. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg
Marcel Holtmann
parent
a69e8375a1
commit
2a1afb5ac8
@ -279,8 +279,8 @@ static int mgmt_cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,
|
||||
void *rp, size_t rp_len)
|
||||
static int mgmt_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;
|
||||
@ -323,8 +323,8 @@ static int read_version(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
rp.version = MGMT_VERSION;
|
||||
rp.revision = cpu_to_le16(MGMT_REVISION);
|
||||
|
||||
return cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, 0, &rp,
|
||||
sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, 0,
|
||||
&rp, sizeof(rp));
|
||||
}
|
||||
|
||||
static int read_commands(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
@ -354,8 +354,8 @@ static int read_commands(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
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, 0, rp,
|
||||
rp_size);
|
||||
err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_COMMANDS, 0,
|
||||
rp, rp_size);
|
||||
kfree(rp);
|
||||
|
||||
return err;
|
||||
@ -413,8 +413,8 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
|
||||
read_unlock(&hci_dev_list_lock);
|
||||
|
||||
err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_INDEX_LIST, 0, rp,
|
||||
rp_len);
|
||||
err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_INDEX_LIST,
|
||||
0, rp, rp_len);
|
||||
|
||||
kfree(rp);
|
||||
|
||||
@ -473,8 +473,8 @@ static int read_unconf_index_list(struct sock *sk, struct hci_dev *hdev,
|
||||
|
||||
read_unlock(&hci_dev_list_lock);
|
||||
|
||||
err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_UNCONF_INDEX_LIST,
|
||||
0, rp, rp_len);
|
||||
err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE,
|
||||
MGMT_OP_READ_UNCONF_INDEX_LIST, 0, rp, rp_len);
|
||||
|
||||
kfree(rp);
|
||||
|
||||
@ -521,8 +521,8 @@ static int send_options_rsp(struct sock *sk, u16 opcode, struct hci_dev *hdev)
|
||||
{
|
||||
__le32 options = get_missing_options(hdev);
|
||||
|
||||
return cmd_complete(sk, hdev->id, opcode, 0, &options,
|
||||
sizeof(options));
|
||||
return mgmt_cmd_complete(sk, hdev->id, opcode, 0, &options,
|
||||
sizeof(options));
|
||||
}
|
||||
|
||||
static int read_config_info(struct sock *sk, struct hci_dev *hdev,
|
||||
@ -549,8 +549,8 @@ static int read_config_info(struct sock *sk, struct hci_dev *hdev,
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_READ_CONFIG_INFO, 0, &rp,
|
||||
sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_READ_CONFIG_INFO, 0,
|
||||
&rp, sizeof(rp));
|
||||
}
|
||||
|
||||
static u32 get_supported_settings(struct hci_dev *hdev)
|
||||
@ -1206,8 +1206,8 @@ static int read_controller_info(struct sock *sk, struct hci_dev *hdev,
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_READ_INFO, 0, &rp,
|
||||
sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_READ_INFO, 0, &rp,
|
||||
sizeof(rp));
|
||||
}
|
||||
|
||||
static void mgmt_pending_free(struct pending_cmd *cmd)
|
||||
@ -1271,8 +1271,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, 0, &settings,
|
||||
sizeof(settings));
|
||||
return mgmt_cmd_complete(sk, hdev->id, opcode, 0, &settings,
|
||||
sizeof(settings));
|
||||
}
|
||||
|
||||
static void clean_up_hci_complete(struct hci_dev *hdev, u8 status, u16 opcode)
|
||||
@ -1512,14 +1512,14 @@ static void cmd_complete_rsp(struct pending_cmd *cmd, void *data)
|
||||
|
||||
static int generic_cmd_complete(struct pending_cmd *cmd, u8 status)
|
||||
{
|
||||
return cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,
|
||||
cmd->param, cmd->param_len);
|
||||
return mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,
|
||||
cmd->param, cmd->param_len);
|
||||
}
|
||||
|
||||
static int addr_cmd_complete(struct pending_cmd *cmd, u8 status)
|
||||
{
|
||||
return cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, cmd->param,
|
||||
sizeof(struct mgmt_addr_info));
|
||||
return mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,
|
||||
cmd->param, sizeof(struct mgmt_addr_info));
|
||||
}
|
||||
|
||||
static u8 mgmt_bredr_support(struct hci_dev *hdev)
|
||||
@ -2407,8 +2407,8 @@ static void mgmt_class_complete(struct hci_dev *hdev, u16 mgmt_op, u8 status)
|
||||
if (!cmd)
|
||||
goto unlock;
|
||||
|
||||
cmd_complete(cmd->sk, cmd->index, cmd->opcode, mgmt_status(status),
|
||||
hdev->dev_class, 3);
|
||||
mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode,
|
||||
mgmt_status(status), hdev->dev_class, 3);
|
||||
|
||||
mgmt_pending_remove(cmd);
|
||||
|
||||
@ -2463,8 +2463,8 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
|
||||
if (err != -ENODATA)
|
||||
goto failed;
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_UUID, 0,
|
||||
hdev->dev_class, 3);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_ADD_UUID, 0,
|
||||
hdev->dev_class, 3);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -2526,8 +2526,9 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
hci_uuids_clear(hdev);
|
||||
|
||||
if (enable_service_cache(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID,
|
||||
0, hdev->dev_class, 3);
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_REMOVE_UUID,
|
||||
0, hdev->dev_class, 3);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -2562,8 +2563,8 @@ update_class:
|
||||
if (err != -ENODATA)
|
||||
goto unlock;
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID, 0,
|
||||
hdev->dev_class, 3);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID, 0,
|
||||
hdev->dev_class, 3);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -2619,8 +2620,8 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
hdev->minor_class = cp->minor;
|
||||
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_SET_DEV_CLASS, 0,
|
||||
hdev->dev_class, 3);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_DEV_CLASS, 0,
|
||||
hdev->dev_class, 3);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -2640,8 +2641,8 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
if (err != -ENODATA)
|
||||
goto unlock;
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_SET_DEV_CLASS, 0,
|
||||
hdev->dev_class, 3);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_DEV_CLASS, 0,
|
||||
hdev->dev_class, 3);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -2734,7 +2735,7 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
key->type, key->pin_len, NULL);
|
||||
}
|
||||
|
||||
cmd_complete(sk, hdev->id, MGMT_OP_LOAD_LINK_KEYS, 0, NULL, 0);
|
||||
mgmt_cmd_complete(sk, hdev->id, MGMT_OP_LOAD_LINK_KEYS, 0, NULL, 0);
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
@ -2768,20 +2769,21 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
rp.addr.type = cp->addr.type;
|
||||
|
||||
if (!bdaddr_type_is_valid(cp->addr.type))
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
|
||||
if (cp->disconnect != 0x00 && cp->disconnect != 0x01)
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
|
||||
MGMT_STATUS_NOT_POWERED, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
|
||||
MGMT_STATUS_NOT_POWERED, &rp,
|
||||
sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -2831,8 +2833,9 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
}
|
||||
|
||||
if (err < 0) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
|
||||
MGMT_STATUS_NOT_PAIRED, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
|
||||
MGMT_STATUS_NOT_PAIRED, &rp,
|
||||
sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -2840,8 +2843,8 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
* link is requested.
|
||||
*/
|
||||
if (!conn) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE, 0,
|
||||
&rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE, 0,
|
||||
&rp, sizeof(rp));
|
||||
device_unpaired(hdev, &cp->addr.bdaddr, cp->addr.type, sk);
|
||||
goto unlock;
|
||||
}
|
||||
@ -2882,21 +2885,22 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
rp.addr.type = cp->addr.type;
|
||||
|
||||
if (!bdaddr_type_is_valid(cp->addr.type))
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!test_bit(HCI_UP, &hdev->flags)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
|
||||
MGMT_STATUS_NOT_POWERED, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
|
||||
MGMT_STATUS_NOT_POWERED, &rp,
|
||||
sizeof(rp));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (mgmt_pending_find(MGMT_OP_DISCONNECT, hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
|
||||
MGMT_STATUS_BUSY, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
|
||||
MGMT_STATUS_BUSY, &rp, sizeof(rp));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -2907,8 +2911,9 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);
|
||||
|
||||
if (!conn || conn->state == BT_OPEN || conn->state == BT_CLOSED) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
|
||||
MGMT_STATUS_NOT_CONNECTED, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
|
||||
MGMT_STATUS_NOT_CONNECTED, &rp,
|
||||
sizeof(rp));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -2996,8 +3001,8 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
/* Recalculate length in case of filtered SCO connections, etc */
|
||||
rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_GET_CONNECTIONS, 0, rp,
|
||||
rp_len);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONNECTIONS, 0, rp,
|
||||
rp_len);
|
||||
|
||||
kfree(rp);
|
||||
|
||||
@ -3095,8 +3100,8 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
BT_DBG("");
|
||||
|
||||
if (cp->io_capability > SMP_IO_KEYBOARD_DISPLAY)
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_SET_IO_CAPABILITY,
|
||||
MGMT_STATUS_INVALID_PARAMS, NULL, 0);
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_IO_CAPABILITY,
|
||||
MGMT_STATUS_INVALID_PARAMS, NULL, 0);
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
@ -3107,8 +3112,8 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_SET_IO_CAPABILITY, 0, NULL,
|
||||
0);
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_IO_CAPABILITY, 0,
|
||||
NULL, 0);
|
||||
}
|
||||
|
||||
static struct pending_cmd *find_pairing(struct hci_conn *conn)
|
||||
@ -3138,8 +3143,8 @@ static int pairing_complete(struct pending_cmd *cmd, u8 status)
|
||||
bacpy(&rp.addr.bdaddr, &conn->dst);
|
||||
rp.addr.type = link_to_bdaddr(conn->type, conn->dst_type);
|
||||
|
||||
err = cmd_complete(cmd->sk, cmd->index, MGMT_OP_PAIR_DEVICE, status,
|
||||
&rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(cmd->sk, cmd->index, MGMT_OP_PAIR_DEVICE,
|
||||
status, &rp, sizeof(rp));
|
||||
|
||||
/* So we don't get further callbacks for this connection */
|
||||
conn->connect_cfm_cb = NULL;
|
||||
@ -3222,20 +3227,21 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
rp.addr.type = cp->addr.type;
|
||||
|
||||
if (!bdaddr_type_is_valid(cp->addr.type))
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
|
||||
if (cp->io_cap > SMP_IO_KEYBOARD_DISPLAY)
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
MGMT_STATUS_NOT_POWERED, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
MGMT_STATUS_NOT_POWERED, &rp,
|
||||
sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -3283,16 +3289,15 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
else
|
||||
status = MGMT_STATUS_CONNECT_FAILED;
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
status, &rp,
|
||||
sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
status, &rp, sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
if (conn->connect_cfm_cb) {
|
||||
hci_conn_drop(conn);
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
MGMT_STATUS_BUSY, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
|
||||
MGMT_STATUS_BUSY, &rp, sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -3368,8 +3373,8 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
cmd->cmd_complete(cmd, MGMT_STATUS_CANCELLED);
|
||||
mgmt_pending_remove(cmd);
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_CANCEL_PAIR_DEVICE, 0,
|
||||
addr, sizeof(*addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_CANCEL_PAIR_DEVICE, 0,
|
||||
addr, sizeof(*addr));
|
||||
unlock:
|
||||
hci_dev_unlock(hdev);
|
||||
return err;
|
||||
@ -3386,9 +3391,9 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, mgmt_op,
|
||||
MGMT_STATUS_NOT_POWERED, addr,
|
||||
sizeof(*addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,
|
||||
MGMT_STATUS_NOT_POWERED, addr,
|
||||
sizeof(*addr));
|
||||
goto done;
|
||||
}
|
||||
|
||||
@ -3398,22 +3403,22 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
|
||||
conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &addr->bdaddr);
|
||||
|
||||
if (!conn) {
|
||||
err = cmd_complete(sk, hdev->id, mgmt_op,
|
||||
MGMT_STATUS_NOT_CONNECTED, addr,
|
||||
sizeof(*addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,
|
||||
MGMT_STATUS_NOT_CONNECTED, addr,
|
||||
sizeof(*addr));
|
||||
goto done;
|
||||
}
|
||||
|
||||
if (addr->type == BDADDR_LE_PUBLIC || addr->type == BDADDR_LE_RANDOM) {
|
||||
err = smp_user_confirm_reply(conn, mgmt_op, passkey);
|
||||
if (!err)
|
||||
err = cmd_complete(sk, hdev->id, mgmt_op,
|
||||
MGMT_STATUS_SUCCESS, addr,
|
||||
sizeof(*addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,
|
||||
MGMT_STATUS_SUCCESS, addr,
|
||||
sizeof(*addr));
|
||||
else
|
||||
err = cmd_complete(sk, hdev->id, mgmt_op,
|
||||
MGMT_STATUS_FAILED, addr,
|
||||
sizeof(*addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,
|
||||
MGMT_STATUS_FAILED, addr,
|
||||
sizeof(*addr));
|
||||
|
||||
goto done;
|
||||
}
|
||||
@ -3538,8 +3543,8 @@ static void set_name_complete(struct hci_dev *hdev, u8 status, u16 opcode)
|
||||
mgmt_cmd_status(cmd->sk, hdev->id, MGMT_OP_SET_LOCAL_NAME,
|
||||
mgmt_status(status));
|
||||
else
|
||||
cmd_complete(cmd->sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,
|
||||
cp, sizeof(*cp));
|
||||
mgmt_cmd_complete(cmd->sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,
|
||||
cp, sizeof(*cp));
|
||||
|
||||
mgmt_pending_remove(cmd);
|
||||
|
||||
@ -3565,8 +3570,8 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
if (!memcmp(hdev->dev_name, cp->name, sizeof(hdev->dev_name)) &&
|
||||
!memcmp(hdev->short_name, cp->short_name,
|
||||
sizeof(hdev->short_name))) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,
|
||||
data, len);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,
|
||||
data, len);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -3575,8 +3580,8 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
memcpy(hdev->dev_name, cp->name, sizeof(hdev->dev_name));
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,
|
||||
data, len);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,
|
||||
data, len);
|
||||
if (err < 0)
|
||||
goto failed;
|
||||
|
||||
@ -3673,9 +3678,10 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
|
||||
BT_DBG("%s ", hdev->name);
|
||||
|
||||
if (!bdaddr_type_is_valid(addr->type))
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
MGMT_STATUS_INVALID_PARAMS, addr,
|
||||
sizeof(*addr));
|
||||
return mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
addr, sizeof(*addr));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
@ -3684,10 +3690,10 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
|
||||
u8 status;
|
||||
|
||||
if (cp->addr.type != BDADDR_BREDR) {
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -3699,8 +3705,9 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
|
||||
else
|
||||
status = MGMT_STATUS_SUCCESS;
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
status, &cp->addr, sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_ADD_REMOTE_OOB_DATA, status,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
} else if (len == MGMT_ADD_REMOTE_OOB_EXT_DATA_SIZE) {
|
||||
struct mgmt_cp_add_remote_oob_ext_data *cp = data;
|
||||
u8 *rand192, *hash192, *rand256, *hash256;
|
||||
@ -3712,10 +3719,10 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
|
||||
*/
|
||||
if (memcmp(cp->rand192, ZERO_KEY, 16) ||
|
||||
memcmp(cp->hash192, ZERO_KEY, 16)) {
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
addr, sizeof(*addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
addr, sizeof(*addr));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -3755,8 +3762,9 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
|
||||
else
|
||||
status = MGMT_STATUS_SUCCESS;
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
status, &cp->addr, sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
status, &cp->addr, sizeof(cp->addr));
|
||||
} else {
|
||||
BT_ERR("add_remote_oob_data: invalid length of %u bytes", len);
|
||||
err = mgmt_cmd_status(sk, hdev->id, MGMT_OP_ADD_REMOTE_OOB_DATA,
|
||||
@ -3778,9 +3786,10 @@ static int remove_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
|
||||
BT_DBG("%s", hdev->name);
|
||||
|
||||
if (cp->addr.type != BDADDR_BREDR)
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
return mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_REMOVE_REMOTE_OOB_DATA,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
@ -3797,8 +3806,8 @@ static int remove_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
|
||||
status = MGMT_STATUS_SUCCESS;
|
||||
|
||||
done:
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
|
||||
status, &cp->addr, sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
|
||||
status, &cp->addr, sizeof(cp->addr));
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
return err;
|
||||
@ -3981,17 +3990,17 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,
|
||||
MGMT_STATUS_NOT_POWERED,
|
||||
&cp->type, sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,
|
||||
MGMT_STATUS_NOT_POWERED,
|
||||
&cp->type, sizeof(cp->type));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (hdev->discovery.state != DISCOVERY_STOPPED ||
|
||||
test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,
|
||||
MGMT_STATUS_BUSY, &cp->type,
|
||||
sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,
|
||||
MGMT_STATUS_BUSY, &cp->type,
|
||||
sizeof(cp->type));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -4014,8 +4023,8 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
|
||||
hci_req_init(&req, hdev);
|
||||
|
||||
if (!trigger_discovery(&req, &status)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,
|
||||
status, &cp->type, sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,
|
||||
status, &cp->type, sizeof(cp->type));
|
||||
mgmt_pending_remove(cmd);
|
||||
goto failed;
|
||||
}
|
||||
@ -4035,8 +4044,8 @@ failed:
|
||||
|
||||
static int service_discovery_cmd_complete(struct pending_cmd *cmd, u8 status)
|
||||
{
|
||||
return cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,
|
||||
cmd->param, 1);
|
||||
return mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,
|
||||
cmd->param, 1);
|
||||
}
|
||||
|
||||
static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,
|
||||
@ -4055,19 +4064,19 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_NOT_POWERED,
|
||||
&cp->type, sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_NOT_POWERED,
|
||||
&cp->type, sizeof(cp->type));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (hdev->discovery.state != DISCOVERY_STOPPED ||
|
||||
test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags)) {
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_BUSY, &cp->type,
|
||||
sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_BUSY, &cp->type,
|
||||
sizeof(cp->type));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -4075,10 +4084,10 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,
|
||||
if (uuid_count > max_uuid_count) {
|
||||
BT_ERR("service_discovery: too big uuid_count value %u",
|
||||
uuid_count);
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_INVALID_PARAMS, &cp->type,
|
||||
sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_INVALID_PARAMS, &cp->type,
|
||||
sizeof(cp->type));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -4086,10 +4095,10 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,
|
||||
if (expected_len != len) {
|
||||
BT_ERR("service_discovery: expected %u bytes, got %u bytes",
|
||||
expected_len, len);
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_INVALID_PARAMS, &cp->type,
|
||||
sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_INVALID_PARAMS, &cp->type,
|
||||
sizeof(cp->type));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -4116,10 +4125,10 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,
|
||||
hdev->discovery.uuids = kmemdup(cp->uuids, uuid_count * 16,
|
||||
GFP_KERNEL);
|
||||
if (!hdev->discovery.uuids) {
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_FAILED,
|
||||
&cp->type, sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
MGMT_STATUS_FAILED,
|
||||
&cp->type, sizeof(cp->type));
|
||||
mgmt_pending_remove(cmd);
|
||||
goto failed;
|
||||
}
|
||||
@ -4128,9 +4137,9 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,
|
||||
hci_req_init(&req, hdev);
|
||||
|
||||
if (!trigger_discovery(&req, &status)) {
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
status, &cp->type, sizeof(cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_START_SERVICE_DISCOVERY,
|
||||
status, &cp->type, sizeof(cp->type));
|
||||
mgmt_pending_remove(cmd);
|
||||
goto failed;
|
||||
}
|
||||
@ -4181,16 +4190,16 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hci_discovery_active(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY,
|
||||
MGMT_STATUS_REJECTED, &mgmt_cp->type,
|
||||
sizeof(mgmt_cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY,
|
||||
MGMT_STATUS_REJECTED, &mgmt_cp->type,
|
||||
sizeof(mgmt_cp->type));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
if (hdev->discovery.type != mgmt_cp->type) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY,
|
||||
MGMT_STATUS_INVALID_PARAMS, &mgmt_cp->type,
|
||||
sizeof(mgmt_cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&mgmt_cp->type, sizeof(mgmt_cp->type));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -4216,8 +4225,8 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
|
||||
/* If no HCI commands were sent we're done */
|
||||
if (err == -ENODATA) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY, 0,
|
||||
&mgmt_cp->type, sizeof(mgmt_cp->type));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY, 0,
|
||||
&mgmt_cp->type, sizeof(mgmt_cp->type));
|
||||
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
|
||||
}
|
||||
|
||||
@ -4238,17 +4247,17 @@ static int confirm_name(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hci_discovery_active(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME,
|
||||
MGMT_STATUS_FAILED, &cp->addr,
|
||||
sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME,
|
||||
MGMT_STATUS_FAILED, &cp->addr,
|
||||
sizeof(cp->addr));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
e = hci_inquiry_cache_lookup_unknown(hdev, &cp->addr.bdaddr);
|
||||
if (!e) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME,
|
||||
MGMT_STATUS_INVALID_PARAMS, &cp->addr,
|
||||
sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME,
|
||||
MGMT_STATUS_INVALID_PARAMS, &cp->addr,
|
||||
sizeof(cp->addr));
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -4260,8 +4269,8 @@ static int confirm_name(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
hci_inquiry_cache_update_resolve(hdev, e);
|
||||
}
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME, 0, &cp->addr,
|
||||
sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME, 0,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
|
||||
failed:
|
||||
hci_dev_unlock(hdev);
|
||||
@ -4278,9 +4287,9 @@ static int block_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
BT_DBG("%s", hdev->name);
|
||||
|
||||
if (!bdaddr_type_is_valid(cp->addr.type))
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_BLOCK_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_BLOCK_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
@ -4296,8 +4305,8 @@ static int block_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
status = MGMT_STATUS_SUCCESS;
|
||||
|
||||
done:
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_BLOCK_DEVICE, status,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_BLOCK_DEVICE, status,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
@ -4314,9 +4323,9 @@ static int unblock_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
BT_DBG("%s", hdev->name);
|
||||
|
||||
if (!bdaddr_type_is_valid(cp->addr.type))
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_UNBLOCK_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_UNBLOCK_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
@ -4332,8 +4341,8 @@ static int unblock_device(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
status = MGMT_STATUS_SUCCESS;
|
||||
|
||||
done:
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_UNBLOCK_DEVICE, status,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_UNBLOCK_DEVICE, status,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
@ -4363,7 +4372,8 @@ static int set_device_id(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
hdev->devid_product = __le16_to_cpu(cp->product);
|
||||
hdev->devid_version = __le16_to_cpu(cp->version);
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_SET_DEVICE_ID, 0, NULL, 0);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_DEVICE_ID, 0,
|
||||
NULL, 0);
|
||||
|
||||
hci_req_init(&req, hdev);
|
||||
update_eir(&req);
|
||||
@ -4564,7 +4574,8 @@ static int set_scan_params(struct sock *sk, struct hci_dev *hdev,
|
||||
hdev->le_scan_interval = interval;
|
||||
hdev->le_scan_window = window;
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_SET_SCAN_PARAMS, 0, NULL, 0);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_SCAN_PARAMS, 0,
|
||||
NULL, 0);
|
||||
|
||||
/* If background scan is running, restart it so new parameters are
|
||||
* loaded.
|
||||
@ -5136,7 +5147,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data,
|
||||
|
||||
set_bit(HCI_RPA_RESOLVING, &hdev->dev_flags);
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_LOAD_IRKS, 0, NULL, 0);
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_LOAD_IRKS, 0, NULL, 0);
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
@ -5246,7 +5257,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
|
||||
key->rand);
|
||||
}
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS, 0,
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS, 0,
|
||||
NULL, 0);
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
@ -5272,8 +5283,8 @@ static int conn_info_cmd_complete(struct pending_cmd *cmd, u8 status)
|
||||
rp.max_tx_power = HCI_TX_POWER_INVALID;
|
||||
}
|
||||
|
||||
err = cmd_complete(cmd->sk, cmd->index, MGMT_OP_GET_CONN_INFO, status,
|
||||
&rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(cmd->sk, cmd->index, MGMT_OP_GET_CONN_INFO,
|
||||
status, &rp, sizeof(rp));
|
||||
|
||||
hci_conn_drop(conn);
|
||||
hci_conn_put(conn);
|
||||
@ -5350,15 +5361,16 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
rp.addr.type = cp->addr.type;
|
||||
|
||||
if (!bdaddr_type_is_valid(cp->addr.type))
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_NOT_POWERED, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_NOT_POWERED, &rp,
|
||||
sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -5369,14 +5381,15 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);
|
||||
|
||||
if (!conn || conn->state != BT_CONNECTED) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_NOT_CONNECTED, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_NOT_CONNECTED, &rp,
|
||||
sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
if (mgmt_pending_find_data(MGMT_OP_GET_CONN_INFO, hdev, conn)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_BUSY, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_BUSY, &rp, sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -5444,8 +5457,8 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
rp.tx_power = conn->tx_power;
|
||||
rp.max_tx_power = conn->max_tx_power;
|
||||
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_SUCCESS, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
|
||||
MGMT_STATUS_SUCCESS, &rp, sizeof(rp));
|
||||
}
|
||||
|
||||
unlock:
|
||||
@ -5478,8 +5491,8 @@ static int clock_info_cmd_complete(struct pending_cmd *cmd, u8 status)
|
||||
}
|
||||
|
||||
complete:
|
||||
err = cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, &rp,
|
||||
sizeof(rp));
|
||||
err = mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, &rp,
|
||||
sizeof(rp));
|
||||
|
||||
if (conn) {
|
||||
hci_conn_drop(conn);
|
||||
@ -5539,15 +5552,16 @@ static int get_clock_info(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
rp.addr.type = cp->addr.type;
|
||||
|
||||
if (cp->addr.type != BDADDR_BREDR)
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_GET_CLOCK_INFO,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CLOCK_INFO,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&rp, sizeof(rp));
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
if (!hdev_is_powered(hdev)) {
|
||||
err = cmd_complete(sk, hdev->id, MGMT_OP_GET_CLOCK_INFO,
|
||||
MGMT_STATUS_NOT_POWERED, &rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CLOCK_INFO,
|
||||
MGMT_STATUS_NOT_POWERED, &rp,
|
||||
sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@ -5555,10 +5569,10 @@ static int get_clock_info(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,
|
||||
&cp->addr.bdaddr);
|
||||
if (!conn || conn->state != BT_CONNECTED) {
|
||||
err = cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_GET_CLOCK_INFO,
|
||||
MGMT_STATUS_NOT_CONNECTED,
|
||||
&rp, sizeof(rp));
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_GET_CLOCK_INFO,
|
||||
MGMT_STATUS_NOT_CONNECTED,
|
||||
&rp, sizeof(rp));
|
||||
goto unlock;
|
||||
}
|
||||
} else {
|
||||
@ -5699,14 +5713,14 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,
|
||||
|
||||
if (!bdaddr_type_is_valid(cp->addr.type) ||
|
||||
!bacmp(&cp->addr.bdaddr, BDADDR_ANY))
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
|
||||
if (cp->action != 0x00 && cp->action != 0x01 && cp->action != 0x02)
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,
|
||||
MGMT_STATUS_INVALID_PARAMS,
|
||||
&cp->addr, sizeof(cp->addr));
|
||||
|
||||
hci_req_init(&req, hdev);
|
||||
|
||||
@ -6018,7 +6032,8 @@ static int load_conn_param(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
return cmd_complete(sk, hdev->id, MGMT_OP_LOAD_CONN_PARAM, 0, NULL, 0);
|
||||
return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_LOAD_CONN_PARAM, 0,
|
||||
NULL, 0);
|
||||
}
|
||||
|
||||
static int set_external_config(struct sock *sk, struct hci_dev *hdev,
|
||||
@ -7218,8 +7233,9 @@ void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192,
|
||||
rp_size -= sizeof(rp.hash256) + sizeof(rp.rand256);
|
||||
}
|
||||
|
||||
cmd_complete(cmd->sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_DATA, 0,
|
||||
&rp, rp_size);
|
||||
mgmt_cmd_complete(cmd->sk, hdev->id,
|
||||
MGMT_OP_READ_LOCAL_OOB_DATA, 0,
|
||||
&rp, rp_size);
|
||||
}
|
||||
|
||||
mgmt_pending_remove(cmd);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user