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

Merge branch 'bugfix/ble_mesh_remove_relay_dependency_v4.1' into 'release/v4.1'

Browse Source 
ble_mesh: Remove relay option dependency (v4.1)

See merge request espressif/esp-idf!9026
This commit is contained in:
Island
2020-08-21 14:56:23 +08:00
parent 7bc32cb773 7f7397e67f
commit 9ff30e81c5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/bt/esp_ble_mesh/mesh_core/net.c
View File

@ -1473,9 +1473,8 @@ void bt_mesh_net_recv(struct net_buf_simple *data, s8_t rssi,
/* Relay if this was a group/virtual address, or if the destination /* Relay if this was a group/virtual address, or if the destination
* was neither a local element nor an LPN we're Friends for. * was neither a local element nor an LPN we're Friends for.
*/ */
if (IS_ENABLED(CONFIG_BLE_MESH_RELAY) && if (!BLE_MESH_ADDR_IS_UNICAST(rx.ctx.recv_dst) ||
(!BLE_MESH_ADDR_IS_UNICAST(rx.ctx.recv_dst) || (!rx.local_match && !rx.friend_match)) {
(!rx.local_match && !rx.friend_match))) {
net_buf_simple_restore(&buf, &state); net_buf_simple_restore(&buf, &state);
bt_mesh_net_relay(&buf, &rx); bt_mesh_net_relay(&buf, &rx);
} }