diff --git a/applications/matter_bridge/Kconfig b/applications/matter_bridge/Kconfig index 31117458c1c8..9ddeab5d0db3 100644 --- a/applications/matter_bridge/Kconfig +++ b/applications/matter_bridge/Kconfig @@ -82,10 +82,6 @@ config BT_SCAN config BT_MAX_CONN default 10 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -config BT_BUF_ACL_RX_COUNT - default 11 - config BT_SCAN_FILTER_ENABLE default y diff --git a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf index 48808c740b35..3cd450ba2ff8 100644 --- a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -7,9 +7,6 @@ # Set 10 BLE connections, as it is an upper limit supported caused by RAM usage due to using Thread and BLE at same time. CONFIG_BT_MAX_CONN=10 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=11 - # Set buffer sizes in a consistent way with the ones used by the network core. #id if oncomment it there is an error that rx buffer is out of range (minimal value is 69) CONFIG_BT_BUF_ACL_RX_SIZE=69 diff --git a/applications/matter_bridge/overlay-bt_max_connections_app.conf b/applications/matter_bridge/overlay-bt_max_connections_app.conf index a7a28b3b0514..83de533d7cd6 100644 --- a/applications/matter_bridge/overlay-bt_max_connections_app.conf +++ b/applications/matter_bridge/overlay-bt_max_connections_app.conf @@ -7,9 +7,6 @@ # Set 20 BLE connections, as it is an upper limit supported by the Soft Device Controller. CONFIG_BT_MAX_CONN=20 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=21 - # Set buffer sizes in a consistent way with the ones used by the network core. CONFIG_BT_BUF_ACL_RX_SIZE=84 CONFIG_BT_BUF_ACL_TX_SIZE=84 diff --git a/applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index f374982e3a69..4b4bc4779acc 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -7,9 +7,6 @@ # Set 10 BLE connections, as it is an upper limit supported caused by RAM usage due to using Thread and BLE at same time. CONFIG_BT_MAX_CONN=10 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=11 - # Decrease stack and buffer sizes to free some RAM and support 10 BLE connections CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 diff --git a/applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf b/applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf index 52966d80e502..37aecb94e2cc 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf +++ b/applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf @@ -7,9 +7,6 @@ # Set 20 BLE connections, as it is an upper limit supported by the Soft Device Controller CONFIG_BT_MAX_CONN=20 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=21 - # Decrease stack and buffer sizes to free some RAM and support 20 BLE connections CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 diff --git a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf index 53027640a46b..d2a5c115037a 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf @@ -27,9 +27,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=11 - # Debug and assert configuration CONFIG_ASSERT=y CONFIG_DEBUG_INFO=y diff --git a/samples/bluetooth/peripheral_with_multiple_identities/prj.conf b/samples/bluetooth/peripheral_with_multiple_identities/prj.conf index 67d478632a6e..c2a5bd25b051 100644 --- a/samples/bluetooth/peripheral_with_multiple_identities/prj.conf +++ b/samples/bluetooth/peripheral_with_multiple_identities/prj.conf @@ -14,4 +14,3 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n CONFIG_BT_EXT_ADV_MAX_ADV_SET=20 CONFIG_BT_MAX_CONN=20 CONFIG_BT_ID_MAX=20 -CONFIG_BT_BUF_ACL_RX_COUNT=21 diff --git a/samples/bluetooth/scanning_while_connecting/prj.conf b/samples/bluetooth/scanning_while_connecting/prj.conf index f2f8f481a5fc..a993513bbe08 100644 --- a/samples/bluetooth/scanning_while_connecting/prj.conf +++ b/samples/bluetooth/scanning_while_connecting/prj.conf @@ -20,4 +20,3 @@ CONFIG_BT_CTLR_FAL_SIZE=255 CONFIG_LOG=y CONFIG_BT_MAX_CONN=16 -CONFIG_BT_BUF_ACL_RX_COUNT=17