diff --git a/applications/machine_learning/configuration/nrf52840dk_nrf52840/prj_nus.conf b/applications/machine_learning/configuration/nrf52840dk_nrf52840/prj_nus.conf index 3147cd0f8849..a7f9e35d1022 100644 --- a/applications/machine_learning/configuration/nrf52840dk_nrf52840/prj_nus.conf +++ b/applications/machine_learning/configuration/nrf52840dk_nrf52840/prj_nus.conf @@ -121,7 +121,7 @@ CONFIG_BT_BONDABLE=y CONFIG_BT_SETTINGS=y CONFIG_BT_NUS=y -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6 diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj.conf index a07879b3ddb3..29c077610443 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj.conf +++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj.conf @@ -118,7 +118,7 @@ CONFIG_ADXL362_INACTIVITY_THRESHOLD=0 CONFIG_ADXL362_ACTIVITY_THRESHOLD=110 CONFIG_ADXL362_ABS_REF_MODE=1 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT=y CONFIG_BT_SMP=y diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj_release.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj_release.conf index ee63b9e51b63..62bb7c6bfc54 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj_release.conf +++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj_release.conf @@ -117,7 +117,7 @@ CONFIG_ADXL362_INACTIVITY_THRESHOLD=0 CONFIG_ADXL362_ACTIVITY_THRESHOLD=110 CONFIG_ADXL362_ABS_REF_MODE=1 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT=y CONFIG_BT_SMP=y diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj_rtt.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj_rtt.conf index 471a8040426b..dd0c09ff0e5e 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj_rtt.conf +++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj_rtt.conf @@ -124,7 +124,7 @@ CONFIG_ADXL362_INACTIVITY_THRESHOLD=0 CONFIG_ADXL362_ACTIVITY_THRESHOLD=110 CONFIG_ADXL362_ABS_REF_MODE=1 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT=y CONFIG_BT_SMP=y diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj.conf index a07879b3ddb3..29c077610443 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj.conf +++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj.conf @@ -118,7 +118,7 @@ CONFIG_ADXL362_INACTIVITY_THRESHOLD=0 CONFIG_ADXL362_ACTIVITY_THRESHOLD=110 CONFIG_ADXL362_ABS_REF_MODE=1 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT=y CONFIG_BT_SMP=y diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj_release.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj_release.conf index ee63b9e51b63..62bb7c6bfc54 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj_release.conf +++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj_release.conf @@ -117,7 +117,7 @@ CONFIG_ADXL362_INACTIVITY_THRESHOLD=0 CONFIG_ADXL362_ACTIVITY_THRESHOLD=110 CONFIG_ADXL362_ABS_REF_MODE=1 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT=y CONFIG_BT_SMP=y diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj_rtt.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj_rtt.conf index 471a8040426b..dd0c09ff0e5e 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj_rtt.conf +++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj_rtt.conf @@ -124,7 +124,7 @@ CONFIG_ADXL362_INACTIVITY_THRESHOLD=0 CONFIG_ADXL362_ACTIVITY_THRESHOLD=110 CONFIG_ADXL362_ABS_REF_MODE=1 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT=y CONFIG_BT_SMP=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf index 68bcc3a4a1f8..4c7d7595ac59 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf @@ -93,7 +93,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_ENTROPY_CC3XX=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf index 539e4a937992..af6b2d57d770 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf @@ -128,7 +128,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Support for GATT long (reliable) writes allows to perform fwupd DFU over Bluetooth LE with GATT # Clients that do not perform MTU exchange. Needed to support fwupd BLE DFU with ChromeOS and Floss. diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf index a402c9a24ac0..7f7d2d158654 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf @@ -100,7 +100,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=6 -CONFIG_BT_CONN_TX_MAX=6 +CONFIG_BT_BUF_ACL_TX_COUNT=6 CONFIG_ENTROPY_CC3XX=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf index e5f1215b9223..1c5e7e43d117 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf @@ -97,7 +97,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_ENTROPY_CC3XX=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf index 7f8ec38fa240..aafef5b9a9e7 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf @@ -109,7 +109,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_ENTROPY_CC3XX=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf index 08a356ecc717..990f572654ed 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf @@ -90,7 +90,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_ENTROPY_CC3XX=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf index 94adf2c4bfe5..d9976538eedd 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf @@ -99,7 +99,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Support for GATT long (reliable) writes allows to perform fwupd DFU over Bluetooth LE with GATT # Clients that do not perform MTU exchange. Needed to support fwupd BLE DFU with ChromeOS and Floss. diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf index 28feefbfc11e..f698696f5e8d 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf @@ -130,7 +130,7 @@ CONFIG_BT_ID_MAX=6 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_ENTROPY_CC3XX=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf index 44bef023faca..715d11f1be94 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf @@ -170,7 +170,7 @@ CONFIG_BT_ID_MAX=4 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Support for GATT long (reliable) writes allows to perform fwupd DFU over Bluetooth LE with GATT # Clients that do not perform MTU exchange. Needed to support fwupd BLE DFU with ChromeOS and Floss. diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf index 8f3578ff4c1b..e3284df64a14 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf @@ -157,7 +157,7 @@ CONFIG_BT_ID_MAX=6 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_ENTROPY_CC3XX=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf index f959b498cfde..075336c624a9 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf @@ -125,7 +125,7 @@ CONFIG_BT_ID_MAX=6 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_ENTROPY_CC3XX=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf index 6d443b9154e6..949cd12de0b6 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf @@ -164,7 +164,7 @@ CONFIG_BT_ID_MAX=4 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Support for GATT long (reliable) writes allows to perform fwupd DFU over Bluetooth LE with GATT # Clients that do not perform MTU exchange. Needed to support fwupd BLE DFU with ChromeOS and Floss. diff --git a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf index 7862184feb18..6915838792a7 100644 --- a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf @@ -95,7 +95,7 @@ CONFIG_BT_MAX_PAIRED=2 CONFIG_BT_ID_MAX=3 CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT_CTLR_FAL_SIZE=1 CONFIG_BT_CTLR_RL_SIZE=2 diff --git a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf index e93ecba0562c..2b656817fa95 100644 --- a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf @@ -90,7 +90,7 @@ CONFIG_BT_MAX_PAIRED=2 CONFIG_BT_ID_MAX=3 CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_BT_CTLR_FAL_SIZE=1 CONFIG_BT_CTLR_RL_SIZE=2 diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf index a9fcbfd5dc39..ff829b216b2e 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf @@ -103,7 +103,7 @@ CONFIG_BT_ID_MAX=5 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=6 -CONFIG_BT_CONN_TX_MAX=6 +CONFIG_BT_BUF_ACL_TX_COUNT=6 ################################################################################ diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf index bb12964555d1..d0b93bf90467 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf @@ -100,7 +100,7 @@ CONFIG_BT_ID_MAX=5 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=6 -CONFIG_BT_CONN_TX_MAX=6 +CONFIG_BT_BUF_ACL_TX_COUNT=6 CONFIG_FW_INFO=y CONFIG_FW_INFO_FIRMWARE_VERSION=1 diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf index c1d17c55436e..60757e89860b 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf @@ -130,7 +130,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=6 -CONFIG_BT_CONN_TX_MAX=6 +CONFIG_BT_BUF_ACL_TX_COUNT=6 # Support for GATT long (reliable) writes allows to perform fwupd DFU over Bluetooth LE with GATT # Clients that do not perform MTU exchange. Needed to support fwupd BLE DFU with ChromeOS and Floss. diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf index d03f775a832c..2006a4e937c6 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf @@ -98,7 +98,7 @@ CONFIG_BT_MAX_PAIRED=2 CONFIG_BT_ID_MAX=3 CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Enable MCUmgr Bluetooth transport CONFIG_MCUMGR_TRANSPORT_BT=y diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf index 793a82484ac5..5eb1718af876 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf @@ -92,7 +92,7 @@ CONFIG_BT_MAX_PAIRED=2 CONFIG_BT_ID_MAX=3 CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Enable MCUmgr Bluetooth transport CONFIG_MCUMGR_TRANSPORT_BT=y diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj.conf index 196869e46947..d91c3aad42dd 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj.conf @@ -84,7 +84,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # External FLASH is not used by the application. Disable the driver. CONFIG_SPI_NOR=n diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release.conf index 0dc4280849fd..9647a51f016a 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release.conf @@ -86,7 +86,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_fast_pair.conf index 350e73033223..cbf6d959bc0f 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_fast_pair.conf @@ -105,7 +105,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Support for GATT long (reliable) writes allows to perform fwupd DFU over Bluetooth LE with GATT # Clients that do not perform MTU exchange. Needed to support fwupd BLE DFU with ChromeOS and Floss. diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_keyboard.conf index 546c5001a8c0..60fcb6127aba 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_keyboard.conf @@ -93,7 +93,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=6 -CONFIG_BT_CONN_TX_MAX=6 +CONFIG_BT_BUF_ACL_TX_COUNT=6 CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj.conf index 96d82d9e3a68..af0ca8541a6e 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj.conf @@ -84,7 +84,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_fast_pair.conf index 136fe515fc98..55555d683b9c 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_fast_pair.conf @@ -119,7 +119,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Support for GATT long (reliable) writes allows to perform fwupd DFU over Bluetooth LE with GATT # Clients that do not perform MTU exchange. Needed to support fwupd BLE DFU with ChromeOS and Floss. diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_keyboard.conf index b93d2e37836f..3e1742de6688 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_keyboard.conf @@ -89,7 +89,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=6 -CONFIG_BT_CONN_TX_MAX=6 +CONFIG_BT_BUF_ACL_TX_COUNT=6 CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_release.conf index 2d4e586602e6..4734d29f8bd3 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_release.conf @@ -85,7 +85,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj.conf index 9b256c160949..889c3e8f3fa4 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj.conf @@ -84,7 +84,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_fast_pair.conf index 3f07cc3da2b5..24c4bc006d9a 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_fast_pair.conf @@ -119,7 +119,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 # Support for GATT long (reliable) writes allows to perform fwupd DFU over Bluetooth LE with GATT # Clients that do not perform MTU exchange. Needed to support fwupd BLE DFU with ChromeOS and Floss. diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_keyboard.conf index fd6d38c43d04..0185113c0409 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_keyboard.conf @@ -89,7 +89,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=6 -CONFIG_BT_CONN_TX_MAX=6 +CONFIG_BT_BUF_ACL_TX_COUNT=6 CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_release.conf index c09806a7bfd0..ef91450645a4 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_release.conf @@ -85,7 +85,7 @@ CONFIG_BT_ID_MAX=3 CONFIG_BT_CTLR_SDC_LLPM=y CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 +CONFIG_BT_BUF_ACL_TX_COUNT=4 CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y diff --git a/doc/nrf/test_and_optimize/optimizing/memory.rst b/doc/nrf/test_and_optimize/optimizing/memory.rst index 8ce0df5b0636..5fe8583608cb 100644 --- a/doc/nrf/test_and_optimize/optimizing/memory.rst +++ b/doc/nrf/test_and_optimize/optimizing/memory.rst @@ -60,7 +60,6 @@ Besides applying `General recommendations`_, you can also complete the following * :kconfig:option:`CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT` * :kconfig:option:`CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE` * :kconfig:option:`CONFIG_BT_BUF_EVT_RX_COUNT` - * :kconfig:option:`CONFIG_BT_CONN_TX_MAX` * :kconfig:option:`CONFIG_BT_L2CAP_TX_BUF_COUNT` * :kconfig:option:`CONFIG_BT_BUF_ACL_TX_COUNT` * :kconfig:option:`CONFIG_BT_BUF_ACL_TX_SIZE` diff --git a/samples/bluetooth/peripheral_lbs/prj_minimal.conf b/samples/bluetooth/peripheral_lbs/prj_minimal.conf index 8e64445f7962..ab8347b3df82 100644 --- a/samples/bluetooth/peripheral_lbs/prj_minimal.conf +++ b/samples/bluetooth/peripheral_lbs/prj_minimal.conf @@ -104,7 +104,7 @@ CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=43 CONFIG_BT_BUF_EVT_RX_COUNT=2 -CONFIG_BT_CONN_TX_MAX=3 +CONFIG_BT_BUF_ACL_TX_COUNT=3 CONFIG_BT_L2CAP_TX_BUF_COUNT=2 CONFIG_BT_ATT_TX_COUNT=2 CONFIG_BT_BUF_EVT_RX_COUNT=4 diff --git a/samples/bluetooth/peripheral_power_profiling/src/main.c b/samples/bluetooth/peripheral_power_profiling/src/main.c index c9e74a3955ef..c09e247de9b0 100644 --- a/samples/bluetooth/peripheral_power_profiling/src/main.c +++ b/samples/bluetooth/peripheral_power_profiling/src/main.c @@ -54,7 +54,7 @@ #define NON_CONNECTABLE_ADV_INTERVAL_MIN CONFIG_BT_POWER_PROFILING_NON_CONNECTABLE_ADV_INTERVAL_MIN #define NON_CONNECTABLE_ADV_INTERVAL_MAX CONFIG_BT_POWER_PROFILING_NON_CONNECTABLE_ADV_INTERVAL_MAX -#define NOTIFICATION_PIPELINE_SIZE CONFIG_BT_CONN_TX_MAX +#define NOTIFICATION_PIPELINE_SIZE CONFIG_BT_BUF_ACL_TX_COUNT #define NFC_BUFFER_SIZE 1024 diff --git a/samples/bluetooth/peripheral_uart/prj_minimal.conf b/samples/bluetooth/peripheral_uart/prj_minimal.conf index 56cea63ed63a..cbcd1cf7d485 100644 --- a/samples/bluetooth/peripheral_uart/prj_minimal.conf +++ b/samples/bluetooth/peripheral_uart/prj_minimal.conf @@ -123,7 +123,7 @@ CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=43 CONFIG_BT_BUF_EVT_RX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=3 +CONFIG_BT_BUF_ACL_TX_COUNT=3 CONFIG_BT_L2CAP_TX_BUF_COUNT=2 CONFIG_BT_ATT_TX_COUNT=2 CONFIG_BT_BUF_ACL_TX_COUNT=3 diff --git a/samples/bluetooth/throughput/prj.conf b/samples/bluetooth/throughput/prj.conf index fec67f3a6fa9..b1e2a4ecda0a 100644 --- a/samples/bluetooth/throughput/prj.conf +++ b/samples/bluetooth/throughput/prj.conf @@ -34,7 +34,6 @@ CONFIG_BT_ATT_PREPARE_COUNT=2 CONFIG_BT_ATT_TX_COUNT=10 CONFIG_BT_L2CAP_TX_MTU=498 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y -CONFIG_BT_CONN_TX_MAX=10 CONFIG_BT_BUF_EVT_RX_COUNT=11 CONFIG_BT_BUF_ACL_TX_COUNT=10 CONFIG_BT_BUF_ACL_TX_SIZE=502 diff --git a/samples/wifi/ble_coex/prj.conf b/samples/wifi/ble_coex/prj.conf index 45d035860b23..9bfc1148b70a 100644 --- a/samples/wifi/ble_coex/prj.conf +++ b/samples/wifi/ble_coex/prj.conf @@ -104,7 +104,8 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_ATT_PREPARE_COUNT=2 -CONFIG_BT_CONN_TX_MAX=10 +CONFIG_BT_BUF_EVT_RX_COUNT=11 +CONFIG_BT_BUF_ACL_TX_COUNT=10 CONFIG_BT_L2CAP_TX_BUF_COUNT=10 CONFIG_BT_L2CAP_TX_MTU=498 CONFIG_BT_BUF_ACL_TX_SIZE=502 diff --git a/west.yml b/west.yml index 75548d9c1d31..72a32a8459b4 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 666ecc89074c708e71fa0e2f2151cefe617b3606 + revision: pull/2868/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above