]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Bluetooth: Fix the HCI to MGMT status conversion table
authorYu Liu <yudiliu@google.com>
Mon, 19 Apr 2021 23:53:30 +0000 (16:53 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 08:01:09 +0000 (10:01 +0200)
[ Upstream commit 4ef36a52b0e47c80bbfd69c0cce61c7ae9f541ed ]

0x2B, 0x31 and 0x33 are reserved for future use but were not present in
the HCI to MGMT conversion table, this caused the conversion to be
incorrect for the HCI status code greater than 0x2A.

Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
Signed-off-by: Yu Liu <yudiliu@google.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/bluetooth/mgmt.c

index 71de147f55584f7074f40a67c5d06dc5d2559c97..06e24b5e164ded6750f2347d7ba175c172422799 100644 (file)
@@ -250,12 +250,15 @@ static const u8 mgmt_status_table[] = {
        MGMT_STATUS_TIMEOUT,            /* Instant Passed */
        MGMT_STATUS_NOT_SUPPORTED,      /* Pairing Not Supported */
        MGMT_STATUS_FAILED,             /* Transaction Collision */
+       MGMT_STATUS_FAILED,             /* Reserved for future use */
        MGMT_STATUS_INVALID_PARAMS,     /* Unacceptable Parameter */
        MGMT_STATUS_REJECTED,           /* QoS Rejected */
        MGMT_STATUS_NOT_SUPPORTED,      /* Classification Not Supported */
        MGMT_STATUS_REJECTED,           /* Insufficient Security */
        MGMT_STATUS_INVALID_PARAMS,     /* Parameter Out Of Range */
+       MGMT_STATUS_FAILED,             /* Reserved for future use */
        MGMT_STATUS_BUSY,               /* Role Switch Pending */
+       MGMT_STATUS_FAILED,             /* Reserved for future use */
        MGMT_STATUS_FAILED,             /* Slot Violation */
        MGMT_STATUS_FAILED,             /* Role Switch Failed */
        MGMT_STATUS_INVALID_PARAMS,     /* EIR Too Large */