Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a1afb5a authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

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: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent a69e8375

net/bluetooth/mgmt.c

+229 −213
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ 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,

static int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,

			     void *rp, size_t rp_len)

{

	struct sk_buff *skb;
@@ -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,7 +521,7 @@ 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,

	return mgmt_cmd_complete(sk, hdev->id, opcode, 0, &options,

				 sizeof(options));

}
@@ -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,7 +1206,7 @@ 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,

	return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_READ_INFO, 0, &rp,

				 sizeof(rp));

}
@@ -1271,7 +1271,7 @@ 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,

	return mgmt_cmd_complete(sk, hdev->id, opcode, 0, &settings,

				 sizeof(settings));

}
@@ -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,

	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,7 +2463,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_ADD_UUID, 0,

					hdev->dev_class, 3);

		goto failed;

	}
@@ -2526,7 +2526,8 @@ 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,

			err = mgmt_cmd_complete(sk, hdev->id,

						MGMT_OP_REMOVE_UUID,

						0, hdev->dev_class, 3);

			goto unlock;

		}
@@ -2562,7 +2563,7 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data, 
		if (err != -ENODATA)

			goto unlock;



		err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID, 0,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID, 0,

					hdev->dev_class, 3);

		goto unlock;

	}
@@ -2619,7 +2620,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_DEV_CLASS, 0,

					hdev->dev_class, 3);

		goto unlock;

	}
@@ -2640,7 +2641,7 @@ 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,

		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,

		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,

		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,7 +2843,7 @@ 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,

		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,20 +2885,21 @@ 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,

		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,

		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,7 +3001,7 @@ 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,

	err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONNECTIONS, 0, rp,

				rp_len);



	kfree(rp);
@@ -3095,7 +3100,7 @@ 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,

		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,

		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,

		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,15 +3289,14 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,

					MGMT_STATUS_BUSY, &rp, sizeof(rp));

		goto unlock;

	}
@@ -3368,7 +3373,7 @@ 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,

	err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_CANCEL_PAIR_DEVICE, 0,

				addr, sizeof(*addr));

unlock:

	hci_dev_unlock(hdev);
@@ -3386,7 +3391,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,

					MGMT_STATUS_NOT_POWERED, addr,

					sizeof(*addr));

		goto done;
@@ -3398,7 +3403,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,

					MGMT_STATUS_NOT_CONNECTED, addr,

					sizeof(*addr));

		goto done;
@@ -3407,11 +3412,11 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
	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,

			err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,

						MGMT_STATUS_SUCCESS, addr,

						sizeof(*addr));

		else

			err = cmd_complete(sk, hdev->id, mgmt_op,

			err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,

						MGMT_STATUS_FAILED, addr,

						sizeof(*addr));
@@ -3538,7 +3543,7 @@ 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,

		mgmt_cmd_complete(cmd->sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,

				  cp, sizeof(*cp));



	mgmt_pending_remove(cmd);
@@ -3565,7 +3570,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,

					data, len);

		goto failed;

	}
@@ -3575,7 +3580,7 @@ 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,

		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,7 +3690,7 @@ 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,

			err = mgmt_cmd_complete(sk, hdev->id,

						MGMT_OP_ADD_REMOTE_OOB_DATA,

						MGMT_STATUS_INVALID_PARAMS,

						&cp->addr, sizeof(cp->addr));
@@ -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,7 +3719,7 @@ 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,

				err = mgmt_cmd_complete(sk, hdev->id,

							MGMT_OP_ADD_REMOTE_OOB_DATA,

							MGMT_STATUS_INVALID_PARAMS,

							addr, sizeof(*addr));
@@ -3755,7 +3762,8 @@ 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,

		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);
@@ -3778,7 +3786,8 @@ 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,

		return mgmt_cmd_complete(sk, hdev->id,

					 MGMT_OP_REMOVE_REMOTE_OOB_DATA,

					 MGMT_STATUS_INVALID_PARAMS,

					 &cp->addr, sizeof(cp->addr));
@@ -3797,7 +3806,7 @@ 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,

	err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_REMOTE_OOB_DATA,

				status, &cp->addr, sizeof(cp->addr));



	hci_dev_unlock(hdev);
@@ -3981,7 +3990,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,

					MGMT_STATUS_NOT_POWERED,

					&cp->type, sizeof(cp->type));

		goto failed;
@@ -3989,7 +3998,7 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev, 


	if (hdev->discovery.state != DISCOVERY_STOPPED ||

	    test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags)) {

		err = cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,

					MGMT_STATUS_BUSY, &cp->type,

					sizeof(cp->type));

		goto failed;
@@ -4014,7 +4023,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_START_DISCOVERY,

					status, &cp->type, sizeof(cp->type));

		mgmt_pending_remove(cmd);

		goto failed;
@@ -4035,7 +4044,7 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev, 


static int service_discovery_cmd_complete(struct pending_cmd *cmd, u8 status)

{

	return cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,

	return mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,

				 cmd->param, 1);

}
@@ -4055,7 +4064,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id,

					MGMT_OP_START_SERVICE_DISCOVERY,

					MGMT_STATUS_NOT_POWERED,

					&cp->type, sizeof(cp->type));
@@ -4064,7 +4073,7 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev, 


	if (hdev->discovery.state != DISCOVERY_STOPPED ||

	    test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags)) {

		err = cmd_complete(sk, hdev->id,

		err = mgmt_cmd_complete(sk, hdev->id,

					MGMT_OP_START_SERVICE_DISCOVERY,

					MGMT_STATUS_BUSY, &cp->type,

					sizeof(cp->type));
@@ -4075,7 +4084,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id,

					MGMT_OP_START_SERVICE_DISCOVERY,

					MGMT_STATUS_INVALID_PARAMS, &cp->type,

					sizeof(cp->type));
@@ -4086,7 +4095,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id,

					MGMT_OP_START_SERVICE_DISCOVERY,

					MGMT_STATUS_INVALID_PARAMS, &cp->type,

					sizeof(cp->type));
@@ -4116,7 +4125,7 @@ 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,

			err = mgmt_cmd_complete(sk, hdev->id,

						MGMT_OP_START_SERVICE_DISCOVERY,

						MGMT_STATUS_FAILED,

						&cp->type, sizeof(cp->type));
@@ -4128,7 +4137,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id,

					MGMT_OP_START_SERVICE_DISCOVERY,

					status, &cp->type, sizeof(cp->type));

		mgmt_pending_remove(cmd);
@@ -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,

		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,7 +4225,7 @@ 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,

		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,7 +4247,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME,

					MGMT_STATUS_FAILED, &cp->addr,

					sizeof(cp->addr));

		goto failed;
@@ -4246,7 +4255,7 @@ static int confirm_name(struct sock *sk, struct hci_dev *hdev, void *data, 


	e = hci_inquiry_cache_lookup_unknown(hdev, &cp->addr.bdaddr);

	if (!e) {

		err = cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME,

		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,7 +4287,7 @@ 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,

		return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_BLOCK_DEVICE,

					 MGMT_STATUS_INVALID_PARAMS,

					 &cp->addr, sizeof(cp->addr));
@@ -4296,7 +4305,7 @@ 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,

	err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_BLOCK_DEVICE, status,

				&cp->addr, sizeof(cp->addr));



	hci_dev_unlock(hdev);
@@ -4314,7 +4323,7 @@ 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,

		return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_UNBLOCK_DEVICE,

					 MGMT_STATUS_INVALID_PARAMS,

					 &cp->addr, sizeof(cp->addr));
@@ -4332,7 +4341,7 @@ 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,

	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,

		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,13 +5381,14 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,

					MGMT_STATUS_BUSY, &rp, sizeof(rp));

		goto unlock;

	}
@@ -5444,7 +5457,7 @@ 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,

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,

					MGMT_STATUS_SUCCESS, &rp, sizeof(rp));

	}
@@ -5478,7 +5491,7 @@ static int clock_info_cmd_complete(struct pending_cmd *cmd, u8 status) 
	}



complete:

	err = cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, &rp,

	err = mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, &rp,

				sizeof(rp));



	if (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,

		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,7 +5569,7 @@ 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,

			err = mgmt_cmd_complete(sk, hdev->id,

						MGMT_OP_GET_CLOCK_INFO,

						MGMT_STATUS_NOT_CONNECTED,

						&rp, sizeof(rp));
@@ -5699,12 +5713,12 @@ 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,

		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,

		return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,

					 MGMT_STATUS_INVALID_PARAMS,

					 &cp->addr, sizeof(cp->addr));
@@ -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,7 +7233,8 @@ 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,

		mgmt_cmd_complete(cmd->sk, hdev->id,

				  MGMT_OP_READ_LOCAL_OOB_DATA, 0,

				  &rp, rp_size);

	}