diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf index e1b91fa381a..0f4aaece609 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf @@ -68,7 +68,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 +CONFIG_BT_CTLR_SCAN_AUX_SET=3 +# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_SCAN_UNRESERVED=y diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf index c71e29d0b07..6bdb3ec176a 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf @@ -65,7 +65,9 @@ CONFIG_BT_CTLR_ADV_AUX_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 +CONFIG_BT_CTLR_SCAN_AUX_SET=3 +# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf index 538d965c12a..663751c16e6 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf @@ -54,6 +54,8 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains CONFIG_BT_CTLR_SCAN_AUX_SET=1 +# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 CONFIG_BT_CTLR_SCAN_UNRESERVED=y CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf index 21c5ac86e7c..1b8d2197cc0 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf @@ -74,7 +74,7 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 +CONFIG_BT_CTLR_SCAN_AUX_SET=3 # CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y # CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 diff --git a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf index 18c87bc0c18..0f776fd3af7 100644 --- a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf @@ -52,7 +52,7 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 +CONFIG_BT_CTLR_SCAN_AUX_SET=3 # CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y # CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 diff --git a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf index 72dd6caa609..8aae9e7c17a 100644 --- a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf @@ -51,7 +51,7 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 +CONFIG_BT_CTLR_SCAN_AUX_SET=3 # CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y # CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 diff --git a/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf b/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf index 26718f348a3..9460650a4cd 100644 --- a/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf @@ -23,7 +23,7 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 +CONFIG_BT_CTLR_SCAN_AUX_SET=3 # CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y # CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 diff --git a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf index c9beb293fe3..be19c24777c 100644 --- a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf @@ -62,7 +62,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 # Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 +CONFIG_BT_CTLR_SCAN_AUX_SET=3 +# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y +# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n diff --git a/tests/bsim/bluetooth/ll/multiple_id/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf b/tests/bsim/bluetooth/ll/multiple_id/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf index 7dc53386b6d..0e3a2742b7a 100644 --- a/tests/bsim/bluetooth/ll/multiple_id/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/ll/multiple_id/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf @@ -1,7 +1,7 @@ # Maximum simultaneous ACL connections, today's maximum considering other # roles using ticker nodes count up to 255 (UINT8_MAX) in the hci_ipc with ISO # support -CONFIG_BT_MAX_CONN=233 +CONFIG_BT_MAX_CONN=231 # Each PHY update can pause connections for 6 interval hence to let other # parallel connection establishment to succeed increase Rx buffer count. @@ -29,6 +29,6 @@ CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n # Required maximum simultaneous LLCP contexts -CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=233 +CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=231 CONFIG_LOG=y diff --git a/tests/bsim/bluetooth/ll/multiple_id/prj.conf b/tests/bsim/bluetooth/ll/multiple_id/prj.conf index 345c7b2a64b..d18535a43e3 100644 --- a/tests/bsim/bluetooth/ll/multiple_id/prj.conf +++ b/tests/bsim/bluetooth/ll/multiple_id/prj.conf @@ -12,8 +12,8 @@ CONFIG_BT_AUTO_DATA_LEN_UPDATE=y # Maximum simultaneous ACL connections, current maximum considering other roles # using ticker nodes count up to 255 (UINT8_MAX) in the hci_ipc with ISO support -CONFIG_BT_MAX_CONN=233 -CONFIG_BT_ID_MAX=233 +CONFIG_BT_MAX_CONN=231 +CONFIG_BT_ID_MAX=231 # Avoid using the PPCP provided connection interval so that the multiple # connections are kept non-overlapping as initially scheduled at connection @@ -26,7 +26,7 @@ CONFIG_BT_GATT_CLIENT=y # Having simulataneous SMP procedures leads to deadlock, disabled pending # required investigation of the issue. # CONFIG_BT_SMP=y -# CONFIG_BT_MAX_PAIRED=233 +# CONFIG_BT_MAX_PAIRED=231 CONFIG_BT_L2CAP_TX_MTU=247