aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-03-01 20:13:19 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-03-01 20:19:24 -0500
commit5f15903279143eb640f9ba1c0e72b52fe9e9e2a6 (patch)
tree6eed1909e54f252f0ce46c0550c240a099a30e3e /net/bluetooth/mgmt.c
parentd4f68526e438dbb7d194b08499a96c733131ad72 (diff)
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>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bd01e4a4784e..fa9a58964278 100644
--- 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)
2682 hdev = hci_dev_get(index); 2682 hdev = hci_dev_get(index);
2683 if (!hdev) { 2683 if (!hdev) {
2684 err = cmd_status(sk, index, opcode, 2684 err = cmd_status(sk, index, opcode,
2685 MGMT_STATUS_INVALID_PARAMS); 2685 MGMT_STATUS_INVALID_INDEX);
2686 goto done; 2686 goto done;
2687 } 2687 }
2688 } 2688 }
@@ -2698,7 +2698,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
2698 if ((hdev && opcode < MGMT_OP_READ_INFO) || 2698 if ((hdev && opcode < MGMT_OP_READ_INFO) ||
2699 (!hdev && opcode >= MGMT_OP_READ_INFO)) { 2699 (!hdev && opcode >= MGMT_OP_READ_INFO)) {
2700 err = cmd_status(sk, index, opcode, 2700 err = cmd_status(sk, index, opcode,
2701 MGMT_STATUS_INVALID_PARAMS); 2701 MGMT_STATUS_INVALID_INDEX);
2702 goto done; 2702 goto done;
2703 } 2703 }
2704 2704
@@ -2745,7 +2745,7 @@ int mgmt_index_added(struct hci_dev *hdev)
2745 2745
2746int mgmt_index_removed(struct hci_dev *hdev) 2746int mgmt_index_removed(struct hci_dev *hdev)
2747{ 2747{
2748 u8 status = MGMT_STATUS_INVALID_PARAMS; 2748 u8 status = MGMT_STATUS_INVALID_INDEX;
2749 2749
2750 mgmt_pending_foreach(0, hdev, cmd_status_rsp, &status); 2750 mgmt_pending_foreach(0, hdev, cmd_status_rsp, &status);
2751 2751