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: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index d33457d657c3281f27e17505b03fb6a862af111d..0ca3519e08bd16d2607c1ee1e02efbf266c1830a 100644 (file)
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -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;

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bd01e4a4784ebb7052ac37b6d638b5a38150f0d2..fa9a5896427858e0e8fd6fcb7eeae5c98e0a75f0 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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);