Merge branch 'bugfix/ble_mesh_remove_relay_dependency_v3.3' into 'release/v3.3'
ble_mesh: Remove relay option dependency (v3.3) See merge request espressif/esp-idf!9028
This commit is contained in:
commit
ad2447a6ea
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue