[GitHub] rymanluk closed pull request #722: nimble/mesh: Minor mesh fixes

[GitBox <gi...@apache.org>]

rymanluk closed pull request #722: nimble/mesh: Minor mesh fixes
URL: https://github.com/apache/mynewt-core/pull/722
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/apps/blemesh/src/main.c b/apps/blemesh/src/main.c
index 602b88139..762381d9e 100755
--- a/apps/blemesh/src/main.c
+++ b/apps/blemesh/src/main.c
@@ -400,7 +400,9 @@ blemesh_on_sync(void)
         return;
     }
 
+#if (MYNEWT_VAL(BLE_MESH_SHELL))
     shell_register_default_module("mesh");
+#endif
 
     console_printf("Mesh initialized\n");
 }
diff --git a/net/nimble/host/mesh/src/prov.c b/net/nimble/host/mesh/src/prov.c
index ac4702b41..623464305 100644
--- a/net/nimble/host/mesh/src/prov.c
+++ b/net/nimble/host/mesh/src/prov.c
@@ -131,6 +131,7 @@ struct prov_link {
 
 #if (MYNEWT_VAL(BLE_MESH_PB_ADV))
 	u32_t id;                /* Link ID */
+#endif
 
 	struct {
 		u8_t  id;        /* Transaction ID */
@@ -154,7 +155,6 @@ struct prov_link {
 		/* Retransmit timer */
 		struct k_delayed_work retransmit;
 	} tx;
-#endif
 };
 
 struct prov_rx {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services