From: Luiz Augusto von Dentz <[email protected]>
When setting up an advertisement the code shall always attempt to use
the handle set by the instance since it may not be equal to the instance
ID.
Fixes: e77f43d531af ("Bluetooth: hci_core: Fix not handling hdev->le_num_of_adv_sets=1")
Signed-off-by: Luiz Augusto von Dentz <[email protected]>
---
net/bluetooth/hci_sync.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 353de476a5cd..d24b08a111c0 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -1194,7 +1194,7 @@ int hci_setup_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance)
cp.own_addr_type = own_addr_type;
cp.channel_map = hdev->le_adv_channel_map;
- cp.handle = instance;
+ cp.handle = adv ? adv->handle : instance;
if (flags & MGMT_ADV_FLAG_SEC_2M) {
cp.primary_phy = HCI_ADV_PHY_1M;
--
2.45.0
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=853440
---Test result---
Test Summary:
CheckPatch PASS 0.47 seconds
GitLint PASS 0.19 seconds
SubjectPrefix PASS 0.06 seconds
BuildKernel PASS 31.04 seconds
CheckAllWarning PASS 33.50 seconds
CheckSparse PASS 39.09 seconds
CheckSmatch FAIL 35.69 seconds
BuildKernel32 PASS 29.93 seconds
TestRunnerSetup PASS 535.92 seconds
TestRunner_l2cap-tester FAIL 23.26 seconds
TestRunner_iso-tester FAIL 37.73 seconds
TestRunner_bnep-tester PASS 4.86 seconds
TestRunner_mgmt-tester FAIL 112.30 seconds
TestRunner_rfcomm-tester PASS 7.57 seconds
TestRunner_sco-tester FAIL 17.53 seconds
TestRunner_ioctl-tester PASS 7.96 seconds
TestRunner_mesh-tester PASS 6.15 seconds
TestRunner_smp-tester PASS 6.98 seconds
TestRunner_userchan-tester PASS 5.05 seconds
IncrementalBuild PASS 28.83 seconds
Details
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: net/bluetooth/hci_core.o] Error 139
make[4]: *** Deleting file 'net/bluetooth/hci_core.o'
make[3]: *** [scripts/Makefile.build:485: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: net] Error 2
make[2]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bcm203x.o] Error 139
make[4]: *** Deleting file 'drivers/bluetooth/bcm203x.o'
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:485: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1919: .] Error 2
make: *** [Makefile:240: __sub-make] Error 2
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner
Output:
Total: 55, Passed: 53 (96.4%), Failed: 2, Not Run: 0
Failed Test Cases
L2CAP BR/EDR Client - TX Timestamping Timed out 2.189 seconds
L2CAP LE Client - TX Timestamping Timed out 2.133 seconds
##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:
Total: 122, Passed: 118 (96.7%), Failed: 4, Not Run: 0
Failed Test Cases
ISO Send - TX Timestamping Timed out 2.179 seconds
ISO Send - TX Sched Timestamping Timed out 1.992 seconds
ISO Send - TX CMSG Timestamping Timed out 1.995 seconds
ISO Send - TX No Poll Timestamping Failed 0.166 seconds
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 492, Passed: 488 (99.2%), Failed: 2, Not Run: 2
Failed Test Cases
Read Exp Feature - Success (Index None) Failed 0.085 seconds
LL Privacy - Add Device 7 (AL is full) Failed 0.203 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
Total: 15, Passed: 14 (93.3%), Failed: 1, Not Run: 0
Failed Test Cases
SCO CVSD Send - TX Timestamping Timed out 2.076 seconds
---
Regards,
Linux Bluetooth
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[email protected]>:
On Wed, 15 May 2024 10:34:47 -0400 you wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> When setting up an advertisement the code shall always attempt to use
> the handle set by the instance since it may not be equal to the instance
> ID.
>
> Fixes: e77f43d531af ("Bluetooth: hci_core: Fix not handling hdev->le_num_of_adv_sets=1")
> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
>
> [...]
Here is the summary with links:
- [v1] Bluetooth: hci_sync: Fix not using correct handle
https://git.kernel.org/bluetooth/bluetooth-next/c/1a556e63116d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html