From a650639daca2edee6a6127d22e47eb567f4e78d4 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Tue, 29 Jul 2025 01:35:34 +0000 Subject: [PATCH] ANDROID: Remove additional TCP congestion configs from microdroid These features aren't needed in microdroid so remove them. Bug: 434256355 Signed-off-by: Isaac J. Manjarres (cherry picked from https://android-review.googlesource.com/q/commit:c4165adf75728678ae0504a73e76e73ef03c651a) Merged-In: I1d2d50cdb59b88189ce113c18304fce265f34525 Change-Id: I1d2d50cdb59b88189ce113c18304fce265f34525 --- arch/arm64/configs/microdroid_defconfig | 5 +++++ arch/x86/configs/microdroid_defconfig | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/arch/arm64/configs/microdroid_defconfig b/arch/arm64/configs/microdroid_defconfig index ec61318c7492..df18097b7af8 100644 --- a/arch/arm64/configs/microdroid_defconfig +++ b/arch/arm64/configs/microdroid_defconfig @@ -66,6 +66,11 @@ CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_INET_DIAG is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set +# CONFIG_TCP_CONG_CUBIC is not set +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set # CONFIG_IPV6 is not set CONFIG_VSOCKETS=y CONFIG_VIRTIO_VSOCKETS=y diff --git a/arch/x86/configs/microdroid_defconfig b/arch/x86/configs/microdroid_defconfig index baafc6ace4c7..52e47e4dbc3c 100644 --- a/arch/x86/configs/microdroid_defconfig +++ b/arch/x86/configs/microdroid_defconfig @@ -69,6 +69,11 @@ CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_INET_DIAG is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set +# CONFIG_TCP_CONG_CUBIC is not set +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set # CONFIG_IPV6 is not set CONFIG_VSOCKETS=y CONFIG_VIRTIO_VSOCKETS=y