From 0dd2a872138a1fbd451f91175cbbdc8389d9aaec Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Mon, 18 Oct 2021 16:06:28 +0200 Subject: require modules required for bandwidth limiting on 5.10+ T+ Test: TreeHugger Bug: 157552970 Change-Id: I0095f5dbddc915e41efd5a7a8cdab5c34c5cf946 (cherry picked from commit d3c4f1712445903effc55503f059c787ebbd486c) Merged-In: I0095f5dbddc915e41efd5a7a8cdab5c34c5cf946 --- android-5.10/android-base.config | 4 ++++ android-5.15/android-base.config | 4 ++++ t/android-5.10/android-base.config | 4 ++++ t/android-5.15/android-base.config | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/android-5.10/android-base.config b/android-5.10/android-base.config index 42eb70f..52bf43d 100644 --- a/android-5.10/android-base.config +++ b/android-5.10/android-base.config @@ -169,8 +169,11 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_BPF=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BPF=y +CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_CLS_U32=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y @@ -181,6 +184,7 @@ CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_SCH_TBF=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y diff --git a/android-5.15/android-base.config b/android-5.15/android-base.config index 42eb70f..5ce4ef6 100644 --- a/android-5.15/android-base.config +++ b/android-5.15/android-base.config @@ -169,9 +169,12 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_BPF=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BPF=y CONFIG_NET_CLS_U32=y +CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y CONFIG_NET_IPGRE_DEMUX=y @@ -181,6 +184,7 @@ CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_SCH_TBF=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y diff --git a/t/android-5.10/android-base.config b/t/android-5.10/android-base.config index 42eb70f..52bf43d 100644 --- a/t/android-5.10/android-base.config +++ b/t/android-5.10/android-base.config @@ -169,8 +169,11 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_BPF=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BPF=y +CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_CLS_U32=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y @@ -181,6 +184,7 @@ CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_SCH_TBF=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y diff --git a/t/android-5.15/android-base.config b/t/android-5.15/android-base.config index 42eb70f..5ce4ef6 100644 --- a/t/android-5.15/android-base.config +++ b/t/android-5.15/android-base.config @@ -169,9 +169,12 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NET_ACT_POLICE=y +CONFIG_NET_ACT_BPF=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BPF=y CONFIG_NET_CLS_U32=y +CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y CONFIG_NET_IPGRE_DEMUX=y @@ -181,6 +184,7 @@ CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_SCH_TBF=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y -- cgit v1.2.3