2019-07-25 18:29:21

by Stotland, Inga

Subject: [PATCH BlueZ] mesh: Fix storage init of Friend and LPN features

This fixes a typo in mesh-config-json.c when Friend feature
was initialized twice and LPN was not initialized at all.
---
mesh/mesh-config-json.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
index 75015e607..e3baf5dc6 100644
--- a/mesh/mesh-config-json.c
+++ b/mesh/mesh-config-json.c
@@ -1191,7 +1191,7 @@ static void parse_features(json_object *jconfig, struct mesh_config_node *node)
if (json_object_object_get_ex(jconfig, "lowPower", &jvalue)) {
mode = get_mode(jvalue);
if (mode <= MESH_MODE_UNSUPPORTED)
- node->modes.friend = mode;
+ node->modes.lpn = mode;
}

if (json_object_object_get_ex(jconfig, "beacon", &jvalue)) {
--
2.21.0

2019-07-26 19:24:12

by Gix, Brian

Subject: Re: [PATCH BlueZ] mesh: Fix storage init of Friend and LPN features

Applied

On Thu, 2019-07-25 at 11:26 -0700, Inga Stotland wrote:
> This fixes a typo in mesh-config-json.c when Friend feature
> was initialized twice and LPN was not initialized at all.
> ---
> mesh/mesh-config-json.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
> index 75015e607..e3baf5dc6 100644
> --- a/mesh/mesh-config-json.c
> +++ b/mesh/mesh-config-json.c
> @@ -1191,7 +1191,7 @@ static void parse_features(json_object *jconfig, struct mesh_config_node *node)
> if (json_object_object_get_ex(jconfig, "lowPower", &jvalue)) {
> mode = get_mode(jvalue);
> if (mode <= MESH_MODE_UNSUPPORTED)
> - node->modes.friend = mode;
> + node->modes.lpn = mode;
> }
>
> if (json_object_object_get_ex(jconfig, "beacon", &jvalue)) {