Bluetooth: Mesh: Fix resetting heartbeat subscription expiry properly

Johan Hedberg · Anas Nashif · commit a23d390225aa · 2017-10-19T05:34:48.000-04:00
Set the value clearly to 0 instead of letting the old expiry time stay
around.

Signed-off-by: Johan Hedberg &lt;johan.hedberg@intel.com&gt;
diff --git a/subsys/bluetooth/host/mesh/cfg.c b/subsys/bluetooth/host/mesh/cfg.c
@@ -2837,6 +2837,8 @@ static void heartbeat_sub_set(struct bt_mesh_model *model,
 
 	if (period_ms) {
 		cfg->hb_sub.expiry = k_uptime_get() + period_ms;
+	} else {
+		cfg->hb_sub.expiry = 0;
 	}
 
 	hb_sub_send_status(model, ctx, STATUS_SUCCESS);

Original file line number	Diff line number	Diff line change
`@@ -2837,6 +2837,8 @@ static void heartbeat_sub_set(struct bt_mesh_model *model,`
`2837`	`2837`
`2838`	`2838`	`if (period_ms) {`
`2839`	`2839`	`cfg->hb_sub.expiry = k_uptime_get() + period_ms;`
	`2840`	`+ } else {`
	`2841`	`+ cfg->hb_sub.expiry = 0;`
`2840`	`2842`	`}`
`2841`	`2843`
`2842`	`2844`	`hb_sub_send_status(model, ctx, STATUS_SUCCESS);`