From 0d09f6189ae35b93ff3879210cc5ecdd9eda0808 Mon Sep 17 00:00:00 2001 From: Inga Stotland Date: Wed, 18 Nov 2020 11:56:00 -0800 Subject: [PATCH] mesh: Fix regression error in HB subscription set This fixes a regression introduced in commit c77bb848a9fb ("mesh: Refactor heartbeat pub/sub"): Heartbeat subscription should be enabled unless either source or destination are unassigned addresses or period log is zero. Also, decrement ref count on group destination address if period log is zero since the subscription is not supposed to be processed. Change-Id: I981784d5e260e90dce022ee8785d3d1b47348e57 Signed-off-by: anuj.bhumiya --- mesh/net.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mesh/net.c b/mesh/net.c index 07c6e55..68b2503 100644 --- a/mesh/net.c +++ b/mesh/net.c @@ -3580,16 +3580,21 @@ int mesh_net_set_heartbeat_sub(struct mesh_net *net, uint16_t src, uint16_t dst, sub->max_hops = 0; } else if (!period_log && src == sub->src && dst == sub->dst) { + if (IS_GROUP(sub->dst)) + mesh_net_dst_unreg(net, sub->dst); + /* Preserve collected data, but disable */ sub->enabled = false; sub->period = 0; - } else if (sub->dst != dst) { - if (IS_GROUP(sub->dst)) - mesh_net_dst_unreg(net, sub->dst); + } else { + if (sub->dst != dst) { + if (IS_GROUP(sub->dst)) + mesh_net_dst_unreg(net, sub->dst); - if (IS_GROUP(dst)) - mesh_net_dst_reg(net, dst); + if (IS_GROUP(dst)) + mesh_net_dst_reg(net, dst); + } sub->enabled = !!period_log; sub->src = src; -- 2.7.4