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

Commit 5f159032 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: mgmt: Add new error code for invalid index 



The index is part of the command header and not its parameters so it
makes sense to distinguish this from the invalid parameters error.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d4f68526

include/net/bluetooth/mgmt.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#define MGMT_STATUS_DISCONNECTED	0x0e

#define MGMT_STATUS_NOT_POWERED		0x0f

#define MGMT_STATUS_CANCELLED		0x10

#define MGMT_STATUS_INVALID_INDEX	0x11



struct mgmt_hdr {

	__le16 opcode;

net/bluetooth/mgmt.c

+3 −3
Original line number Diff line number Diff line
@@ -2682,7 +2682,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) 
		hdev = hci_dev_get(index);

		if (!hdev) {

			err = cmd_status(sk, index, opcode,

					MGMT_STATUS_INVALID_PARAMS);

					MGMT_STATUS_INVALID_INDEX);

			goto done;

		}

	}
@@ -2698,7 +2698,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) 
	if ((hdev && opcode < MGMT_OP_READ_INFO) ||

			(!hdev && opcode >= MGMT_OP_READ_INFO)) {

		err = cmd_status(sk, index, opcode,

						MGMT_STATUS_INVALID_PARAMS);

						MGMT_STATUS_INVALID_INDEX);

		goto done;

	}
@@ -2745,7 +2745,7 @@ int mgmt_index_added(struct hci_dev *hdev) 


int mgmt_index_removed(struct hci_dev *hdev)

{

	u8 status = MGMT_STATUS_INVALID_PARAMS;

	u8 status = MGMT_STATUS_INVALID_INDEX;



	mgmt_pending_foreach(0, hdev, cmd_status_rsp, &status);