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

Merge branch 'fix/outstanding_packet_race_condition_v5.5' into 'release/v5.5'

Browse Source 
fix(nimble): Fixed async race condition with HCI outstanding packets counter (v5.5)

See merge request espressif/esp-idf!39092
This commit is contained in:
Rahul Tank
2025-05-15 13:43:43 +08:00
parent f8cdf02b55 81f5d899f6
commit 4498eea285
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/bt/host/nimble/Kconfig.in
View File

@ -600,6 +600,13 @@ if BT_NIMBLE_50_FEATURE_SUPPORT
will be supported from BLE 5.0 onwards.
if BT_NIMBLE_EXT_ADV
config BT_NIMBLE_EXT_ADV_V2
bool "Enable support for extended adv v2"
default n
depends on BT_NIMBLE_EXT_ADV
help
Enable this option to use Extended Adv V2 command instead of V1.
config BT_NIMBLE_MAX_EXT_ADV_INSTANCES
int "Maximum number of extended advertising instances."
range 0 4
@ -1094,8 +1101,7 @@ config BT_NIMBLE_HIGH_DUTY_ADV_ITVL
config BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN
bool "Allow Connections with scanning in progress"
depends on BT_NIMBLE_ENABLED
depends on (!SOC_ESP_NIMBLE_CONTROLLER || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32H2)
depends on BT_NIMBLE_ENABLED && !(IDF_TARGET_ESP32C2)
help
This enables support for user to initiate a new connection with scan in progress

2
components/bt/host/nimble/nimble

Submodule components/bt/host/nimble/nimble updated: 5c6b832167...f5136d2b35

8
components/bt/host/nimble/port/include/esp_nimble_cfg.h
View File

@ -98,6 +98,14 @@
#define MYNEWT_VAL_BLE_EXT_ADV (CONFIG_BT_NIMBLE_EXT_ADV)
#endif
#ifndef MYNEWT_VAL_BLE_EXT_ADV_V2
#ifdef CONFIG_BT_NIMBLE_EXT_ADV_V2
#define MYNEWT_VAL_BLE_EXT_ADV_V2 (CONFIG_BT_NIMBLE_EXT_ADV_V2)
#else
#define MYNEWT_VAL_BLE_EXT_ADV_V2 (0)
#endif
#endif
#ifndef CONFIG_BT_NIMBLE_EXT_ADV_MAX_SIZE
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
#else