[BlueZ,1/2] btdev: fix CIG ID on Set CIG Parameters error response

Commit Message

Pauli Virtanen Aug. 5, 2023, 12:29 p.m. UTC

Set CIG Parameters shall return correct CIG ID in Command_Complete also
when it errors.
---
 emulator/btdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

[e-mail] Aug. 5, 2023, 2 p.m. UTC | #1

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=773356

---Test result---

Test Summary:
CheckPatch                    FAIL      1.33 seconds
GitLint                       PASS      0.69 seconds
BuildEll                      PASS      27.37 seconds
BluezMake                     PASS      887.61 seconds
MakeCheck                     PASS      12.75 seconds
MakeDistcheck                 PASS      157.93 seconds
CheckValgrind                 PASS      259.09 seconds
CheckSmatch                   WARNING   347.36 seconds
bluezmakeextell               PASS      104.51 seconds
IncrementalBuild              PASS      1448.91 seconds
ScanBuild                     PASS      1077.92 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,2/2] iso-tester: test busy CIG error does not drop existing connections
WARNING:TYPO_SPELLING: 'explictly' may be misspelled - perhaps 'explicitly'?
#97: 
in hci_sync. So the test needs to check the error async and explictly
                                                            ^^^^^^^^^

/github/workspace/src/src/13342572.patch total: 0 errors, 1 warnings, 97 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13342572.patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.


##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
emulator/btdev.c:420:29: warning: Variable length array is used.


---
Regards,
Linux Bluetooth

[e-mail] Aug. 8, 2023, 10 p.m. UTC | #2

Hello:

This series was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Sat,  5 Aug 2023 15:29:06 +0300 you wrote:
> Set CIG Parameters shall return correct CIG ID in Command_Complete also
> when it errors.
> ---
>  emulator/btdev.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Here is the summary with links:
  - [BlueZ,1/2] btdev: fix CIG ID on Set CIG Parameters error response
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=459b095c663c
  - [BlueZ,2/2] iso-tester: test busy CIG error does not drop existing connections
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=96de1c6eb9ff

You are awesome, thank you!

Patch

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 38dcb189e..58414bd74 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -5872,6 +5872,8 @@  static int cmd_set_cig_params(struct btdev *dev, const void *data,
 
 	memset(&rsp, 0, sizeof(rsp));
 
+	rsp.params.cig_id = cmd->cig_id;
+
 	if (cmd->num_cis > ARRAY_SIZE(dev->le_cig[0].cis)) {
 		rsp.params.status = BT_HCI_ERR_MEM_CAPACITY_EXCEEDED;
 		goto done;
@@ -5942,7 +5944,6 @@  static int cmd_set_cig_params(struct btdev *dev, const void *data,
 	}
 
 	rsp.params.status = BT_HCI_ERR_SUCCESS;
-	rsp.params.cig_id = cmd->cig_id;
 
 	for (i = 0; i < cmd->num_cis; i++) {
 		rsp.params.num_handles++;