]> 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 06:53:13 +0000 (08:53 +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 db525321da1f8a2bd3b1817d7b89c92fe2547737..0ae5d3cab4dc2ce33545c6b2c35337483df9a25c 100644 (file)
@@ -219,12 +219,15 @@ static 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 */