Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_remove_relay_dependency_v3.3' into 'release/v3.3'

Browse source 
ble_mesh: Remove relay option dependency (v3.3)

See merge request espressif/esp-idf!9028
This commit is contained in:
Island 2020-06-03 15:20:56 +08:00
parent 686530d373 7937a51779
commit ad2447a6ea
1 changed files with 2 additions and 3 deletions
Show stats 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
* was neither a local element nor an LPN we're Friends for.
*/
if (IS_ENABLED(CONFIG_BLE_MESH_RELAY) &&
(!BLE_MESH_ADDR_IS_UNICAST(rx.ctx.recv_dst) ||
(!rx.local_match && !rx.friend_match))) {
if (!BLE_MESH_ADDR_IS_UNICAST(rx.ctx.recv_dst) ||
(!rx.local_match && !rx.friend_match)) {
net_buf_simple_restore(&buf, &state);
bt_mesh_net_relay(&buf, &rx);
}