bluetooth: host: Replace BT_CONN_TX_MAX with BT_BUF_ACL_TX_COUNT

PavelVPV · PavelVPV · commit bc77f2eb75e9 · 2025-06-03T12:36:41.000+02:00
CONFIG_BT_CONN_TX_MAX has been deprecated. Use
CONFIG_BT_BUF_ACL_TX_COUNT instead.

Signed-off-by: Pavel Vasilyev &lt;pavel.vasilyev@nordicsemi.no&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
