diff options
-rw-r--r-- | include/net/bluetooth/mgmt.h | 1 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index d33457d657c3..0ca3519e08bd 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h | |||
@@ -41,6 +41,7 @@ | |||
41 | #define MGMT_STATUS_DISCONNECTED 0x0e | 41 | #define MGMT_STATUS_DISCONNECTED 0x0e |
42 | #define MGMT_STATUS_NOT_POWERED 0x0f | 42 | #define MGMT_STATUS_NOT_POWERED 0x0f |
43 | #define MGMT_STATUS_CANCELLED 0x10 | 43 | #define MGMT_STATUS_CANCELLED 0x10 |
44 | #define MGMT_STATUS_INVALID_INDEX 0x11 | ||
44 | 45 | ||
45 | struct mgmt_hdr { | 46 | struct mgmt_hdr { |
46 | __le16 opcode; | 47 | __le16 opcode; |
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 | ||
2746 | int mgmt_index_removed(struct hci_dev *hdev) | 2746 | int 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 | ||