feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/IDFGH-11775' into 'master'

Browse Source 
bugfix(ble_mesh): fix NRF mesh(android) provisioning node failed

Closes BLERP-636

See merge request espressif/esp-idf!29737
This commit is contained in:
Island
2024-04-02 14:03:35 +08:00
parent 61cf08fcc8 8160ddee46
commit aa3c7e1030
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/esp_ble_mesh/core/net.c
View File

@@ -34,7 +34,7 @@
#include "mesh_v1.1/utils.h" #include "mesh_v1.1/utils.h"
/* Minimum valid Mesh Network PDU length. The Network headers /* Minimum valid Mesh Network PDU length. The Network headers
* themselves take up 9 bytes. After that there is a minumum of 1 byte * themselves take up 9 bytes. After that there is a minimum of 1 byte
* payload for both CTL=1 and CTL=0 PDUs (smallest OpCode is 1 byte). CTL=1 * payload for both CTL=1 and CTL=0 PDUs (smallest OpCode is 1 byte). CTL=1
* PDUs must use a 64-bit (8 byte) NetMIC, whereas CTL=0 PDUs have at least * PDUs must use a 64-bit (8 byte) NetMIC, whereas CTL=0 PDUs have at least
* a 32-bit (4 byte) NetMIC and AppMIC giving again a total of 8 bytes. * a 32-bit (4 byte) NetMIC and AppMIC giving again a total of 8 bytes.
@@ -1808,7 +1808,7 @@ void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
bt_mesh_elem_find(rx.ctx.recv_dst)); bt_mesh_elem_find(rx.ctx.recv_dst));
if (IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER) && if (IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER) &&
bt_mesh_private_gatt_proxy_state_get() == BLE_MESH_PRIVATE_GATT_PROXY_DISABLED && bt_mesh_private_gatt_proxy_state_get() != BLE_MESH_PRIVATE_GATT_PROXY_ENABLED &&
net_if == BLE_MESH_NET_IF_PROXY) { net_if == BLE_MESH_NET_IF_PROXY) {
bt_mesh_proxy_server_addr_add(data, rx.ctx.addr); bt_mesh_proxy_server_addr_add(data, rx.ctx.addr);