Merge pull request #722 from rymanluk/some_mesh_fixes

nimble/mesh: Minor mesh fixes

X-Original-Commit: 0082f9dc1d60a54186d04104b5d67c4919357663

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 {