This fixes mesh io flow for MESH_IO_TYPE_UNIT_TEST which
got broken after:
commit 9966cb8b6999a5f54fc13acbd7e1526512a84342
("mesh: Add new kernel MGMT based IO transport")
---
mesh/main.c | 8 +++++++-
mesh/mesh-io.c | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/mesh/main.c b/mesh/main.c
index 619b17d88..3bca020a0 100644
--- a/mesh/main.c
+++ b/mesh/main.c
@@ -137,8 +137,14 @@ static void signal_handler(uint32_t signo, void *user_data)
return;
l_info("Terminating");
+
mesh_cleanup(true);
- l_timeout_create(1, kill_to, NULL, NULL);
+
+ if (io_type != MESH_IO_TYPE_UNIT_TEST)
+ l_timeout_create(1, kill_to, NULL, NULL);
+ else
+ l_main_quit();
+
terminated = true;
}
diff --git a/mesh/mesh-io.c b/mesh/mesh-io.c
index ae6a82ee4..233f4b328 100644
--- a/mesh/mesh-io.c
+++ b/mesh/mesh-io.c
@@ -151,7 +151,7 @@ struct mesh_io *mesh_io_new(enum mesh_io_type type, void *opts,
default_io->api = api;
- if (!api->init(default_io, &default_io->favored_index, user_data))
+ if (!api->init(default_io, opts, user_data))
goto fail;
return default_io;
--
2.37.3
Hello:
This patch was applied to bluetooth/bluez.git (master)
by Brian Gix <[email protected]>:
On Wed, 5 Oct 2022 13:43:09 -0700 you wrote:
> This fixes mesh io flow for MESH_IO_TYPE_UNIT_TEST which
> got broken after:
> commit 9966cb8b6999a5f54fc13acbd7e1526512a84342
> ("mesh: Add new kernel MGMT based IO transport")
> ---
> mesh/main.c | 8 +++++++-
> mesh/mesh-io.c | 2 +-
> 2 files changed, 8 insertions(+), 2 deletions(-)
Here is the summary with links:
- [BlueZ] mesh: Fix mesh to work with MESH_IO_TYPE_UNIT_TEST
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=e71e1103abc6
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
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=683315
---Test result---
Test Summary:
CheckPatch FAIL 1.45 seconds
GitLint PASS 1.06 seconds
Prep - Setup ELL PASS 27.23 seconds
Build - Prep PASS 0.83 seconds
Build - Configure PASS 8.75 seconds
Build - Make PASS 840.73 seconds
Make Check PASS 11.94 seconds
Make Check w/Valgrind PASS 293.53 seconds
Make Distcheck PASS 240.01 seconds
Build w/ext ELL - Configure PASS 8.73 seconds
Build w/ext ELL - Make PASS 85.17 seconds
Incremental Build w/ patches PASS 0.00 seconds
Scan Build PASS 502.92 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[BlueZ] mesh: Fix mesh to work with MESH_IO_TYPE_UNIT_TEST
WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '9966cb8b6999a5f54fc13acbd7e1526512a84342', maybe rebased or not pulled?
#67:
commit 9966cb8b6999a5f54fc13acbd7e1526512a84342
/github/workspace/src/12999613.patch total: 0 errors, 1 warnings, 23 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/12999613.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.
---
Regards,
Linux Bluetooth