From 7e41682eb3b9a635adb951bcad1cb8bc5fbed285 Mon Sep 17 00:00:00 2001
From: luoxu <luoxu@espressif.com>
Date: Mon, 9 Dec 2024 16:29:14 +0800
Subject: [PATCH] fix(ble_mesh): Miscellaneous update

---
 components/bt/esp_ble_mesh/mesh_core/beacon.c  | 5 +++++
 components/bt/esp_ble_mesh/mesh_core/cfg_srv.c | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/bt/esp_ble_mesh/mesh_core/beacon.c b/components/bt/esp_ble_mesh/mesh_core/beacon.c
index 981f88edcd..05f7ecc6f7 100644
--- a/components/bt/esp_ble_mesh/mesh_core/beacon.c
+++ b/components/bt/esp_ble_mesh/mesh_core/beacon.c
@@ -27,7 +27,12 @@
 #else
 #define UNPROVISIONED_INTERVAL     K_SECONDS(5)
 #endif
+
+#if CONFIG_BLE_MESH_BQB_TEST
+#define PROVISIONED_INTERVAL       K_SECONDS(3)
+#else
 #define PROVISIONED_INTERVAL       K_SECONDS(10)
+#endif
 
 #define BEACON_TYPE_UNPROVISIONED  0x00
 #define BEACON_TYPE_SECURE         0x01
diff --git a/components/bt/esp_ble_mesh/mesh_core/cfg_srv.c b/components/bt/esp_ble_mesh/mesh_core/cfg_srv.c
index 1cbb569ee6..f626970e0a 100644
--- a/components/bt/esp_ble_mesh/mesh_core/cfg_srv.c
+++ b/components/bt/esp_ble_mesh/mesh_core/cfg_srv.c
@@ -1174,7 +1174,7 @@ static struct label *va_find(const uint8_t *label_uuid,
     return match;
 }
 
-static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
+uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
 {
     struct label *update = NULL, *free_slot = NULL;
 
@@ -1182,6 +1182,9 @@ static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
     if (update) {
         update->ref++;
         va_store(update);
+        if (addr) {
+            *addr = update->addr;
+        }
         return STATUS_SUCCESS;
     }
 
@@ -1201,7 +1204,7 @@ static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
     return STATUS_SUCCESS;
 }
 
-static uint8_t va_del(uint8_t *label_uuid, uint16_t *addr)
+uint8_t va_del(uint8_t *label_uuid, uint16_t *addr)
 {
     struct label *update = NULL;