From 9d360777daa3cabde6efc4c55ce10b0ef6165fab Mon Sep 17 00:00:00 2001 From: "liuwei.a" Date: Mon, 31 May 2021 16:20:14 +0800 Subject: [PATCH] ANDROID: GKI: Request enable some kernel configs for background speed limit function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change reason:to support the background speed limit function, we need to enable the configs as follow: CONFIG_NET_SCH_PRIO=y [*] CONFIG_NET_SCH_MULTIQ=y [*] CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_NETEM=y CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_FLOW=y CONFIG_NET_EMATCH_CMP=y CONFIG_NET_EMATCH_NBYTE=y CONFIG_NET_EMATCH_META=y CONFIG_NET_EMATCH_TEXT=y CONFIG_NET_ACT_POLICE=y [*] CONFIG_NET_ACT_GACT=y [*] CONFIG_NET_ACT_MIRRED=y [*] CONFIG_NET_ACT_SKBEDIT=y [*] additionally enabled during backport to android11-5.4 to match 5.10+ Bug: 189705988 Signed-off-by: Maciej Żenczykowski Signed-off-by: liuwei.a Change-Id: I6f9a627bc2a2197b0da8a371ccd2a762b3147fc1 (cherry picked from commit da4b3a9637de63da6259e43bd4c0ead9504a8e40) --- arch/arm64/configs/gki_defconfig | 13 +++++++++++++ arch/x86/configs/gki_defconfig | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 59ddabbd31fc..e019f7338cf9 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -209,14 +209,27 @@ CONFIG_L2TP=y CONFIG_BRIDGE=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_PRIO=y +CONFIG_NET_SCH_MULTIQ=y +CONFIG_NET_SCH_TBF=y +CONFIG_NET_SCH_NETEM=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_CLS_U32=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_FLOW=y CONFIG_NET_CLS_BPF=y CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_CMP=y +CONFIG_NET_EMATCH_NBYTE=y CONFIG_NET_EMATCH_U32=y +CONFIG_NET_EMATCH_META=y +CONFIG_NET_EMATCH_TEXT=y CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_GACT=y +CONFIG_NET_ACT_MIRRED=y +CONFIG_NET_ACT_SKBEDIT=y CONFIG_NET_ACT_BPF=y CONFIG_BPF_JIT=y CONFIG_BT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 5e751e6cb304..69c584a27a3a 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -188,14 +188,27 @@ CONFIG_L2TP=y CONFIG_BRIDGE=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_PRIO=y +CONFIG_NET_SCH_MULTIQ=y +CONFIG_NET_SCH_TBF=y +CONFIG_NET_SCH_NETEM=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_CLS_U32=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_FLOW=y CONFIG_NET_CLS_BPF=y CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_CMP=y +CONFIG_NET_EMATCH_NBYTE=y CONFIG_NET_EMATCH_U32=y +CONFIG_NET_EMATCH_META=y +CONFIG_NET_EMATCH_TEXT=y CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_GACT=y +CONFIG_NET_ACT_MIRRED=y +CONFIG_NET_ACT_SKBEDIT=y CONFIG_NET_ACT_BPF=y CONFIG_BPF_JIT=y CONFIG_BT=y