From 2a71e09cce446eb87a28d17bff3f19d9d2bffc12 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 Change reason:to support the background speed limit function, we need to enable the configs as follow: CONFIG_NET_SCH_MULTIQ=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_SKBEDIT=y Bug: 189705988 Signed-off-by: Wei Liu Change-Id: I6f9a627bc2a2197b0da8a371ccd2a762b3147fc1 (cherry picked from commit da4b3a9637de63da6259e43bd4c0ead9504a8e40) --- arch/arm64/configs/gki_defconfig | 9 +++++++++ arch/x86/configs/gki_defconfig | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4f0572c90f3e..9b563d378686 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -218,20 +218,29 @@ CONFIG_MAC802154=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_BASIC=y CONFIG_NET_CLS_TCINDEX=y CONFIG_NET_CLS_FW=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_VSOCKETS=y CONFIG_BT=y CONFIG_BT_RFCOMM=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index ba26c3fbe92a..03c0336b78fb 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -199,20 +199,29 @@ CONFIG_MAC802154=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_BASIC=y CONFIG_NET_CLS_TCINDEX=y CONFIG_NET_CLS_FW=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_VSOCKETS=y CONFIG_BT=y CONFIG_BT_RFCOMM=y