espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/no_proxy_beacon_send_after_deinit_v4.4' into 'release/v4.4'

Browse Source 
ble_mesh: stack: Bugfix for proxy beacon send after reinit mesh(v4.4)

See merge request espressif/esp-idf!18791
This commit is contained in:
Jiang Jiang Jian
2022-07-01 17:17:39 +08:00
parent 9616ef8ee8 23e482feeb
commit c9140caf8c
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/bt/esp_ble_mesh/mesh_core/proxy_server.c
View File

@@ -92,13 +92,7 @@ static struct bt_mesh_proxy_client {
#endif #endif
struct k_delayed_work sar_timer; struct k_delayed_work sar_timer;
struct net_buf_simple buf; struct net_buf_simple buf;
} clients[BLE_MESH_MAX_CONN] = { } clients[BLE_MESH_MAX_CONN];
[0 ... (BLE_MESH_MAX_CONN - 1)] = {
#if defined(CONFIG_BLE_MESH_GATT_PROXY_SERVER)
.send_beacons = _K_WORK_INITIALIZER(proxy_send_beacons),
#endif
},
};
static uint8_t client_buf_data[CLIENT_BUF_SIZE * BLE_MESH_MAX_CONN]; static uint8_t client_buf_data[CLIENT_BUF_SIZE * BLE_MESH_MAX_CONN];
@@ -1459,7 +1453,9 @@ int bt_mesh_proxy_server_init(void)
client->buf.size = CLIENT_BUF_SIZE; client->buf.size = CLIENT_BUF_SIZE;
client->buf.__buf = client_buf_data + (i * CLIENT_BUF_SIZE); client->buf.__buf = client_buf_data + (i * CLIENT_BUF_SIZE);
#if defined(CONFIG_BLE_MESH_GATT_PROXY_SERVER)
k_work_init(&client->send_beacons, proxy_send_beacons);
#endif
k_delayed_work_init(&client->sar_timer, proxy_sar_timeout); k_delayed_work_init(&client->sar_timer, proxy_sar_timeout);
} }