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

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

Browse source 
ble_mesh: Remove patch for the bug of an App (v3.3)

See merge request espressif/esp-idf!8780
This commit is contained in:
Island 2020-05-21 11:46:49 +08:00
commit f55719522e
5 changed files with 0 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/bt/esp_ble_mesh/mesh_core/transport.c
View file

@ -698,17 +698,8 @@ static bool is_replay(struct bt_mesh_net_rx *rx, struct bt_mesh_rpl **match)
return true; return true;
} }
#if !CONFIG_BLE_MESH_PATCH_FOR_SLAB_APP_1_1_0
if ((!rx->old_iv && rpl->old_iv) || if ((!rx->old_iv && rpl->old_iv) ||
rpl->seq < rx->seq) { rpl->seq < rx->seq) {
#else /* CONFIG_BLE_MESH_PATCH_FOR_SLAB_APP_1_1_0 */
/**
* Added 10 here to fix the bug of Silicon Lab Android App 1.1.0 when
* reconnection will cause its sequence number recounting from 0.
*/
if ((!rx->old_iv && rpl->old_iv) ||
(rpl->seq < rx->seq) || (rpl->seq > rx->seq + 10)) {
#endif /* #if !CONFIG_BLE_MESH_PATCH_FOR_SLAB_APP_1_1_0 */
if (match) { if (match) {
*match = rpl; *match = rpl;
} else { } else {

6
examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/Kconfig.projbuild
View file

@ -13,10 +13,4 @@ menu "Example Configuration"
bool "ESP32-WROVER" bool "ESP32-WROVER"
endchoice endchoice
config BLE_MESH_PATCH_FOR_SLAB_APP_1_1_0
bool "Fix bug of Silicon Lab Android App v1.1.0 when reconnection will cause sequence number to recount from 0"
default y
help
It is an ad hoc solution and needs further modifications.
endmenu endmenu

6
examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/Kconfig.projbuild
View file

@ -13,10 +13,4 @@ menu "Example Configuration"
bool "ESP32-WROVER" bool "ESP32-WROVER"
endchoice endchoice
config BLE_MESH_PATCH_FOR_SLAB_APP_1_1_0
bool "Fix bug of Silicon Lab Android App v1.1.0 when reconnection will cause sequence number to recount from 0"
default y
help
It is an ad hoc solution and needs further modifications
endmenu endmenu

6
examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/Kconfig.projbuild
View file

@ -13,10 +13,4 @@ menu "Example Configuration"
bool "ESP32-WROVER" bool "ESP32-WROVER"
endchoice endchoice
config BLE_MESH_PATCH_FOR_SLAB_APP_1_1_0
bool "Fix bug of Silicon Lab Android App v1.1.0 when reconnection will cause sequence number to recount from 0"
default y
help
It is an ad hoc solution and needs further modifications
endmenu endmenu

6
examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/Kconfig.projbuild
View file

@ -13,10 +13,4 @@ menu "Example Configuration"
bool "ESP32-WROVER" bool "ESP32-WROVER"
endchoice endchoice
config BLE_MESH_PATCH_FOR_SLAB_APP_1_1_0
bool "Fix bug of Silicon Lab Android App v1.1.0 when reconnection will cause sequence number to recount from 0"
default y
help
It is an ad hoc solution and needs further modifications
endmenu endmenu