Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-05-28 16:46:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/ble_mesh_cpp_compile_issue' into 'master'

Browse Source 
fix(ble_mesh): resolve C++ compilation issue in net.h

Closes BLERP-2398 and BLERP-2399

See merge request espressif/esp-idf!43418
This commit is contained in:
Island
2025-11-17 20:44:44 +08:00
parent 1275fb1f42 e4f514ae10
commit ce13ec7630
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/bt/esp_ble_mesh/core/net.h
View File

@@ -472,7 +472,8 @@ void bt_mesh_generic_net_recv(struct net_buf_simple *data,
static inline void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
enum bt_mesh_net_if net_if)
{
struct bt_mesh_net_rx rx = { .ctx.recv_rssi = rssi };
struct bt_mesh_net_rx rx = {0};
rx.ctx.recv_rssi = rssi;
#if CONFIG_BLE_MESH_EXT_ADV
rx.ctx.enh.adv_cfg_used = false;
rx.ctx.enh.ext_adv_cfg_used = false;

2
components/bt/esp_ble_mesh/core/nimble_host/adapter.c
View File

@@ -474,7 +474,7 @@ void bt_mesh_ble_ext_adv_report(struct ble_gap_ext_disc_desc *desc)
/* Here, only a shallow copy needs to be implemented;
* deep copying behavior occurs in btc_ble_mesh_ble_copy_req_data. */
adv_rpt.data = desc->length_data ? desc->data : NULL;
adv_rpt.data = desc->length_data ? (uint8_t *)desc->data : NULL;
adv_rpt.event_type = desc->props;
adv_rpt.addr_type = desc->addr.type;