| Message ID | ad69720e0ba720209cb04240fbc3c5ff059accbc.1717945321.git.pav@iki.fi |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] Bluetooth: fix connection setup in l2cap_connect | expand |
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=860256 ---Test result--- Test Summary: CheckPatch PASS 0.79 seconds GitLint FAIL 0.54 seconds SubjectPrefix PASS 0.13 seconds BuildKernel PASS 30.75 seconds CheckAllWarning PASS 33.22 seconds CheckSparse PASS 39.03 seconds CheckSmatch FAIL 35.74 seconds BuildKernel32 PASS 28.69 seconds TestRunnerSetup PASS 520.59 seconds TestRunner_l2cap-tester PASS 20.24 seconds TestRunner_iso-tester PASS 32.85 seconds TestRunner_bnep-tester PASS 4.74 seconds TestRunner_mgmt-tester PASS 112.00 seconds TestRunner_rfcomm-tester PASS 7.42 seconds TestRunner_sco-tester PASS 14.92 seconds TestRunner_ioctl-tester PASS 7.73 seconds TestRunner_mesh-tester PASS 5.82 seconds TestRunner_smp-tester PASS 6.79 seconds TestRunner_userchan-tester PASS 4.90 seconds IncrementalBuild PASS 27.56 seconds Details ############################## Test: GitLint - FAIL Desc: Run gitlint Output: [v2] Bluetooth: fix connection setup in l2cap_connect WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search 18: B2 Line has trailing whitespace: " " ############################## 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 --- Regards, Linux Bluetooth
Hi Pauli, On Sun, Jun 9, 2024 at 11:06 AM Pauli Virtanen <pav@iki.fi> wrote: > > The amp_id argument of l2cap_connect() was removed in > commit 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support") > > It was always called with amp_id == 0, i.e. AMP_ID_BREDR == 0x00 (ie. > non-AMP controller). In the above commit, the code path for amp_id != 0 > was preserved, although it should have used the amp_id == 0 one. > > Restore the previous behavior of the non-AMP code path, to fix problems > with L2CAP connections. While at it we could create a test case to cover this code path with l2cap-tester. > Fixes: 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support") > Signed-off-by: Pauli Virtanen <pav@iki.fi> > --- > > Notes: > v2: do the change in the actually right if branch > > Tried proofreading the commit, and this part seemed suspicious. > Can you try if this fixes the problem? > > net/bluetooth/l2cap_core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index c49e0d4b3c0d..aed025734d04 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -4011,8 +4011,8 @@ static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, > status = L2CAP_CS_AUTHOR_PEND; > chan->ops->defer(chan); > } else { > - l2cap_state_change(chan, BT_CONNECT2); > - result = L2CAP_CR_PEND; > + l2cap_state_change(chan, BT_CONFIG); > + result = L2CAP_CR_SUCCESS; > status = L2CAP_CS_NO_INFO; > } > } else { > -- > 2.45.2 > >
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index c49e0d4b3c0d..aed025734d04 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -4011,8 +4011,8 @@ static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, status = L2CAP_CS_AUTHOR_PEND; chan->ops->defer(chan); } else { - l2cap_state_change(chan, BT_CONNECT2); - result = L2CAP_CR_PEND; + l2cap_state_change(chan, BT_CONFIG); + result = L2CAP_CR_SUCCESS; status = L2CAP_CS_NO_INFO; } } else {
The amp_id argument of l2cap_connect() was removed in commit 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support") It was always called with amp_id == 0, i.e. AMP_ID_BREDR == 0x00 (ie. non-AMP controller). In the above commit, the code path for amp_id != 0 was preserved, although it should have used the amp_id == 0 one. Restore the previous behavior of the non-AMP code path, to fix problems with L2CAP connections. Fixes: 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support") Signed-off-by: Pauli Virtanen <pav@iki.fi> --- Notes: v2: do the change in the actually right if branch Tried proofreading the commit, and this part seemed suspicious. Can you try if this fixes the problem? net/bluetooth/l2cap_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)