[PATCH BlueZ] mesh: Only deregister io for the last network detached

[PATCH BlueZ] mesh: Only deregister io for the last network detached

[Michael N. Moran]

When multiple mesh networks are active and one is detached
using Leave(), the I/O to all networks is halted.

This patch prevents that by only deregistering the I/O
if all networks have been detached.

---
 mesh/net.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mesh/net.c b/mesh/net.c
index 01a475d74..9e0ea860f 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -2899,8 +2899,12 @@ struct mesh_io *mesh_net_detach(struct mesh_net *net)
 	io = net->io;
 
 	mesh_io_send_cancel(net->io, &type, 1);
-	mesh_io_deregister_recv_cb(io, snb, sizeof(snb));
-	mesh_io_deregister_recv_cb(io, pkt, sizeof(pkt));
+
+	/* Only deregister io if this is the last network detached.*/
+	if (l_queue_length(nets) < 2) {
+		mesh_io_deregister_recv_cb(io, snb, sizeof(snb));
+		mesh_io_deregister_recv_cb(io, pkt, sizeof(pkt));
+	}
 
 	net->io = NULL;
 	l_queue_remove(nets, net);
-- 
2.26.2

RE: [BlueZ] mesh: Only deregister io for the last network detached

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

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

---Test result---

##############################
Test: CheckPatch - PASS

##############################
Test: CheckGitLint - PASS

##############################
Test: CheckBuild - PASS

##############################
Test: MakeCheck - PASS



---
Regards,
Linux Bluetooth

Re: [PATCH BlueZ] mesh: Only deregister io for the last network detached

[Gix, Brian]

Applied

On Fri, 2020-11-06 at 17:48 -0500, Michael N. Moran wrote:
> When multiple mesh networks are active and one is detached
> using Leave(), the I/O to all networks is halted.
> 
> This patch prevents that by only deregistering the I/O
> if all networks have been detached.
> 
> ---
>  mesh/net.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/mesh/net.c b/mesh/net.c
> index 01a475d74..9e0ea860f 100644
> --- a/mesh/net.c
> +++ b/mesh/net.c
> @@ -2899,8 +2899,12 @@ struct mesh_io *mesh_net_detach(struct mesh_net *net)
>  	io = net->io;
>  
>  	mesh_io_send_cancel(net->io, &type, 1);
> -	mesh_io_deregister_recv_cb(io, snb, sizeof(snb));
> -	mesh_io_deregister_recv_cb(io, pkt, sizeof(pkt));
> +
> +	/* Only deregister io if this is the last network detached.*/
> +	if (l_queue_length(nets) < 2) {
> +		mesh_io_deregister_recv_cb(io, snb, sizeof(snb));
> +		mesh_io_deregister_recv_cb(io, pkt, sizeof(pkt));
> +	}
>  
>  	net->io = NULL;
>  	l_queue_remove(nets, net);