From 9d587eb8fd5ae9a1fc45801f8ea4203f047c9d91 Mon Sep 17 00:00:00 2001 From: lly Date: Thu, 14 May 2020 10:24:15 +0800 Subject: [PATCH] ble_mesh: Remove patch for the bug of an App --- components/bt/esp_ble_mesh/mesh_core/transport.c | 9 --------- .../ble_mesh_node/onoff_client/main/Kconfig.projbuild | 6 ------ .../ble_mesh_node/onoff_server/main/Kconfig.projbuild | 6 ------ .../sensor_server/main/Kconfig.projbuild | 6 ------ .../vendor_server/main/Kconfig.projbuild | 6 ------ 5 files changed, 33 deletions(-) diff --git a/components/bt/esp_ble_mesh/mesh_core/transport.c b/components/bt/esp_ble_mesh/mesh_core/transport.c index 56112c040..b44773cba 100644 --- a/components/bt/esp_ble_mesh/mesh_core/transport.c +++ b/components/bt/esp_ble_mesh/mesh_core/transport.c @@ -698,17 +698,8 @@ static bool is_replay(struct bt_mesh_net_rx *rx, struct bt_mesh_rpl **match) return true; } -#if !CONFIG_BLE_MESH_PATCH_FOR_SLAB_APP_1_1_0 if ((!rx->old_iv && rpl->old_iv) || 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) { *match = rpl; } else { diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/Kconfig.projbuild b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/Kconfig.projbuild index 3bde11ff6..e48a853e0 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/Kconfig.projbuild +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/Kconfig.projbuild @@ -13,10 +13,4 @@ menu "Example Configuration" bool "ESP32-WROVER" 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 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/Kconfig.projbuild b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/Kconfig.projbuild index 18776a7a3..e48a853e0 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/Kconfig.projbuild +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/Kconfig.projbuild @@ -13,10 +13,4 @@ menu "Example Configuration" bool "ESP32-WROVER" 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 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/Kconfig.projbuild b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/Kconfig.projbuild index 18776a7a3..e48a853e0 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/Kconfig.projbuild +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/Kconfig.projbuild @@ -13,10 +13,4 @@ menu "Example Configuration" bool "ESP32-WROVER" 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 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/Kconfig.projbuild b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/Kconfig.projbuild index 18776a7a3..e48a853e0 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/Kconfig.projbuild +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/Kconfig.projbuild @@ -13,10 +13,4 @@ menu "Example Configuration" bool "ESP32-WROVER" 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