From ecdb92d8cd26d544102b5c3e66b1262d236b08d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Narajowski?= <michal.narajowski@codecoup.pl>
Date: Fri, 6 Apr 2018 14:03:40 +0200
Subject: [PATCH] mesh: Fix using extended advertising

---
 nimble/host/mesh/src/glue.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nimble/host/mesh/src/glue.c b/nimble/host/mesh/src/glue.c
index 4ddb486c..20273108 100644
--- a/nimble/host/mesh/src/glue.c
+++ b/nimble/host/mesh/src/glue.c
@@ -32,8 +32,8 @@
 #if MYNEWT_VAL(BLE_MULTI_ADV_INSTANCES) < 1
 #error "Mesh needs at least BLE_MULTI_ADV_INSTANCES set to 1"
 #endif
-#define BT_MESH_ADV_PROXY_INST     (MYNEWT_VAL(BLE_MULTI_ADV_INSTANCES) - 1)
 #endif /* BLE_MESH_PROXY */
+#define BT_MESH_ADV_PROXY_INST     (MYNEWT_VAL(BLE_MULTI_ADV_INSTANCES) - 1)
 #endif /* BLE_EXT_ADV */

 extern u8_t g_mesh_addr_type;
@@ -477,6 +477,8 @@ set_ad(const struct bt_data *ad, size_t ad_len, u8_t *buf, u8_t *buf_len)
 {
     int i;

+    *buf_len = 0;
+
     for (i = 0; i < ad_len; i++) {
         buf[(*buf_len)++] = ad[i].data_len + 1;
         buf[(*buf_len)++] = ad[i].type;
--
2.14.1