commit d0f6fd4b226244b0701cbc46c860f0077dd72c8e
author Patrick Rohr <prohr@google.com> Tue May 24 10:54:42 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 24 10:54:42 2022 +0000
tree ebb8b7d2ad5cb38b825cf3b4a806589f4b52f029
parent 36f0f59a74a4f00b692372b3ce4b6e3cb5d66cfd
parent 0dd2a872138a1fbd451f91175cbbdc8389d9aaec

require modules required for bandwidth limiting on 5.10+ T+ am: 0dd2a87213

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/18561847

Change-Id: I3d50a6dd4d3dfcca4fd8586b07b0b7afed31c99e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android-5.10/android-base.config

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_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_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

android-5.15/android-base.config

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_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_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

t/android-5.10/android-base.config

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_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_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

t/android-5.15/android-base.config

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_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_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