From 999dd0ba79796beafa13d52f9f168563f02c5fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Mon, 14 Jun 2021 11:58:03 -0700 Subject: [PATCH] ANDROID: gki - CONFIG_NET_SCH_FQ=y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was an oversight to previously enable codel / fq_codel without enabling fq itself. Our TCP/BBR team thinks this might be more useful. Test: built and booted on a gki using phone Bug: 124467469 Signed-off-by: Maciej Żenczykowski Change-Id: Ic02c12a3f44bd3526abe06e981b8067e78f0cc75 (cherry picked from commit 45d0c6c5aa59941883c1a0485f06bc1b86bfda98) --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 49dddfa21d1b..661ac2ddcc80 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -229,6 +229,7 @@ CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_NETEM=y CONFIG_NET_SCH_CODEL=y CONFIG_NET_SCH_FQ_CODEL=y +CONFIG_NET_SCH_FQ=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_CLS_BASIC=y CONFIG_NET_CLS_TCINDEX=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 019de2154f2d..1174996606a4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -209,6 +209,7 @@ CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_NETEM=y CONFIG_NET_SCH_CODEL=y CONFIG_NET_SCH_FQ_CODEL=y +CONFIG_NET_SCH_FQ=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_CLS_BASIC=y CONFIG_NET_CLS_TCINDEX=y