diff --git a/6.1/target/linux/generic/config-6.1 b/6.1/target/linux/generic/config-6.1 index bca80cad..96e9e514 100644 --- a/6.1/target/linux/generic/config-6.1 +++ b/6.1/target/linux/generic/config-6.1 @@ -6723,8 +6723,8 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TCG_XEN is not set # CONFIG_TCIC is not set CONFIG_TCP_CONG_ADVANCED=y -# CONFIG_TCP_CONG_BBR is not set -# CONFIG_TCP_CONG_BBR2 is not set +CONFIG_TCP_CONG_BBR=y +CONFIG_TCP_CONG_BBR2=y CONFIG_TCP_CONG_BIC=y CONFIG_TCP_CONG_CDG=y CONFIG_TCP_CONG_CUBIC=y @@ -7037,6 +7037,7 @@ CONFIG_TRAD_SIGNALS=y # CONFIG_TRUSTED_FOUNDATIONS is not set # CONFIG_TRUSTED_KEYS is not set # CONFIG_TRUSTED_KEYS_TPM is not set +# CONFIG_TRUSTED_KEYS_TEE is not set # CONFIG_TSL2583 is not set # CONFIG_TSL2591 is not set # CONFIG_TSL2772 is not set diff --git a/6.1/target/linux/generic/hack-6.1/999-BBRv2.patch b/6.1/target/linux/generic/hack-6.1/999-BBRv2.patch index 343e0e79..8d9b3893 100644 --- a/6.1/target/linux/generic/hack-6.1/999-BBRv2.patch +++ b/6.1/target/linux/generic/hack-6.1/999-BBRv2.patch @@ -805,7 +805,7 @@ index 54eec33c6e1c..fbd8fa11acca 100644 + u32 gso_max_size) +{ + u32 segs; -+ u64 bytes; ++ u32 bytes; + + /* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */ + bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift; diff --git a/6.1/target/linux/rockchip/armv8/config-6.1 b/6.1/target/linux/rockchip/armv8/config-6.1 index 6fac686a..84097146 100644 --- a/6.1/target/linux/rockchip/armv8/config-6.1 +++ b/6.1/target/linux/rockchip/armv8/config-6.1 @@ -632,8 +632,6 @@ CONFIG_SYNC_FILE=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_SYSFS_SYSCALL=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_TCP_CONG_BBR=y -CONFIG_TCP_CONG_BBR2=y # CONFIG_TEXTSEARCH is not set CONFIG_THERMAL=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y diff --git a/6.1/target/linux/x86/config-6.1 b/6.1/target/linux/x86/config-6.1 index 0c856492..d0912008 100644 --- a/6.1/target/linux/x86/config-6.1 +++ b/6.1/target/linux/x86/config-6.1 @@ -480,8 +480,6 @@ CONFIG_SYNC_FILE=y CONFIG_SYSCTL_EXCEPTION_TRACE=y # CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSTEM76_ACPI is not set -CONFIG_TCP_CONG_BBR=y -CONFIG_TCP_CONG_BBR2=y # CONFIG_TELCLOCK is not set # CONFIG_TEST_FPU is not set CONFIG_THERMAL=y