From: Luiz Augusto von Dentz <[email protected]>
Don't try to use HCI_OP_LE_READ_BUFFER_SIZE_V2 if controller don't
support ISO channels, but in order to check if ISO channels are
supported HCI_OP_LE_READ_LOCAL_FEATURES needs to be done earlier so the
features bits can be checked on hci_le_read_buffer_size_sync.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216817
Fixes: c1631dbc00c1 ("Bluetooth: hci_sync: Fix hci_read_buffer_size_sync")
Signed-off-by: Luiz Augusto von Dentz <[email protected]>
---
net/bluetooth/hci_sync.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 5220bfd75b00..fcf4a9af3c62 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -3572,7 +3572,7 @@ static const struct hci_init_stage hci_init2[] = {
static int hci_le_read_buffer_size_sync(struct hci_dev *hdev)
{
/* Use Read LE Buffer Size V2 if supported */
- if (hdev->commands[41] & 0x20)
+ if (iso_capable(hdev) && hdev->commands[41] & 0x20)
return __hci_cmd_sync_status(hdev,
HCI_OP_LE_READ_BUFFER_SIZE_V2,
0, NULL, HCI_CMD_TIMEOUT);
@@ -3597,10 +3597,10 @@ static int hci_le_read_supported_states_sync(struct hci_dev *hdev)
/* LE Controller init stage 2 command sequence */
static const struct hci_init_stage le_init2[] = {
- /* HCI_OP_LE_READ_BUFFER_SIZE */
- HCI_INIT(hci_le_read_buffer_size_sync),
/* HCI_OP_LE_READ_LOCAL_FEATURES */
HCI_INIT(hci_le_read_local_features_sync),
+ /* HCI_OP_LE_READ_BUFFER_SIZE */
+ HCI_INIT(hci_le_read_buffer_size_sync),
/* HCI_OP_LE_READ_SUPPORTED_STATES */
HCI_INIT(hci_le_read_supported_states_sync),
{}
--
2.37.3
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=705763
---Test result---
Test Summary:
CheckPatch PASS 0.66 seconds
GitLint PASS 0.25 seconds
SubjectPrefix PASS 0.06 seconds
BuildKernel PASS 41.88 seconds
CheckAllWarning PASS 44.97 seconds
CheckSparse PASS 51.03 seconds
BuildKernel32 PASS 40.74 seconds
TestRunnerSetup PASS 580.88 seconds
TestRunner_l2cap-tester PASS 20.21 seconds
TestRunner_iso-tester PASS 22.14 seconds
TestRunner_bnep-tester PASS 7.14 seconds
TestRunner_mgmt-tester PASS 133.77 seconds
TestRunner_rfcomm-tester PASS 11.21 seconds
TestRunner_sco-tester PASS 10.35 seconds
TestRunner_ioctl-tester PASS 12.25 seconds
TestRunner_mesh-tester PASS 9.23 seconds
TestRunner_smp-tester PASS 10.31 seconds
TestRunner_userchan-tester PASS 7.77 seconds
IncrementalBuild PASS 37.78 seconds
---
Regards,
Linux Bluetooth
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[email protected]>:
On Mon, 19 Dec 2022 15:49:45 -0800 you wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> Don't try to use HCI_OP_LE_READ_BUFFER_SIZE_V2 if controller don't
> support ISO channels, but in order to check if ISO channels are
> supported HCI_OP_LE_READ_LOCAL_FEATURES needs to be done earlier so the
> features bits can be checked on hci_le_read_buffer_size_sync.
>
> [...]
Here is the summary with links:
- [v2] Bluetooth: hci_sync: Fix use HCI_OP_LE_READ_BUFFER_SIZE_V2
https://git.kernel.org/bluetooth/bluetooth-next/c/711d2d5f3b42
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html