mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-10-29 09:32:34 +00:00
f1a56edd09
This backports more fixes for the Bluetooth subsystem from 4.9. They were found missing during some initial Bluetooth LE testing. Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 345bafc04fa2dea44dbdc8bda5633de256a74262 Mon Sep 17 00:00:00 2001
|
|
From: Yu Liu <yudiliu@google.com>
|
|
Date: Mon, 19 Apr 2021 16:53:30 -0700
|
|
Subject: [PATCH] Bluetooth: Fix the HCI to MGMT status conversion table
|
|
|
|
[ 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 | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
--- a/net/bluetooth/mgmt.c
|
|
+++ b/net/bluetooth/mgmt.c
|
|
@@ -212,12 +212,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 */
|