[PATCH BlueZ] mesh: Remove double initialisation and fix typo in log

[PATCH BlueZ] mesh: Remove double initialisation and fix typo in log

[Rafał Gajda]

---
 mesh/node.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mesh/node.c b/mesh/node.c
index e7e58d9a7..f8b1099e9 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -475,7 +475,6 @@ static bool init_from_storage(struct mesh_config_node *db_node,
 	node->lpn = db_node->modes.lpn;
 
 	node->proxy = db_node->modes.proxy;
-	node->lpn = db_node->modes.lpn;
 	node->friend = db_node->modes.friend;
 	node->relay.mode = db_node->modes.relay.state;
 	node->relay.cnt = db_node->modes.relay.cnt;
@@ -483,7 +482,7 @@ static bool init_from_storage(struct mesh_config_node *db_node,
 	node->beacon = db_node->modes.beacon;
 
 	l_debug("relay %2.2x, proxy %2.2x, lpn %2.2x, friend %2.2x",
-			node->relay.mode, node->proxy, node->friend, node->lpn);
+			node->relay.mode, node->proxy, node->lpn, node->friend);
 	node->ttl = db_node->ttl;
 	node->seq_number = db_node->seq_number;
 
-- 
2.22.0

RE: [PATCH BlueZ] mesh: Remove double initialisation and fix typo in log

[Gix, Brian]

Your two patches applied.... Thanks

> -----Original Message-----
> From: linux-bluetooth-owner@vger.kernel.org [mailto:linux-bluetooth-
> owner@vger.kernel.org] On Behalf Of Rafal Gajda
> Sent: Monday, August 12, 2019 5:07 AM
> To: linux-bluetooth@vger.kernel.org
> Subject: [PATCH BlueZ] mesh: Remove double initialisation and fix typo in log
> 
> ---
>  mesh/node.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/mesh/node.c b/mesh/node.c
> index e7e58d9a7..f8b1099e9 100644
> --- a/mesh/node.c
> +++ b/mesh/node.c
> @@ -475,7 +475,6 @@ static bool init_from_storage(struct mesh_config_node
> *db_node,
>  	node->lpn = db_node->modes.lpn;
> 
>  	node->proxy = db_node->modes.proxy;
> -	node->lpn = db_node->modes.lpn;
>  	node->friend = db_node->modes.friend;
>  	node->relay.mode = db_node->modes.relay.state;
>  	node->relay.cnt = db_node->modes.relay.cnt; @@ -483,7 +482,7 @@
> static bool init_from_storage(struct mesh_config_node *db_node,
>  	node->beacon = db_node->modes.beacon;
> 
>  	l_debug("relay %2.2x, proxy %2.2x, lpn %2.2x, friend %2.2x",
> -			node->relay.mode, node->proxy, node->friend, node-
> >lpn);
> +			node->relay.mode, node->proxy, node->lpn, node-
> >friend);
>  	node->ttl = db_node->ttl;
>  	node->seq_number = db_node->seq_number;
> 
> --
> 2.22.0