diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-09 07:18:01 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-09 07:18:01 +0000 |
| commit | e82fc37c35d071fbe9ce09eaaf9271759d9cf164 (patch) | |
| tree | ebb8b7d2ad5cb38b825cf3b4a806589f4b52f029 | |
| parent | c3d43eb1a769954be23cd4b44b1857ca47764ade (diff) | |
| parent | 4499c08b700351a486df6a29a55862bbc662bda1 (diff) | |
| download | configs-e82fc37c35d071fbe9ce09eaaf9271759d9cf164.tar.gz | |
Snap for 8701348 from 4499c08b700351a486df6a29a55862bbc662bda1 to mainline-uwb-releaseaml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010android13-mainline-uwb-release
Change-Id: I26f5fc1fab9d169f8a958294bbd565b92f94b664
| -rw-r--r-- | android-5.10/android-base.config | 4 | ||||
| -rw-r--r-- | android-5.15/android-base.config | 4 | ||||
| -rw-r--r-- | t/android-5.10/android-base-conditional.xml | 2 | ||||
| -rw-r--r-- | t/android-5.10/android-base.config | 4 | ||||
| -rw-r--r-- | t/android-5.15/android-base-conditional.xml | 2 | ||||
| -rw-r--r-- | t/android-5.15/android-base.config | 4 |
6 files changed, 18 insertions, 2 deletions
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-conditional.xml b/t/android-5.10/android-base-conditional.xml index 5815b65..db24e7f 100644 --- a/t/android-5.10/android-base-conditional.xml +++ b/t/android-5.10/android-base-conditional.xml @@ -1,4 +1,4 @@ -<kernel minlts="5.10.0" /> +<kernel minlts="5.10.107" /> <!-- KEEP ALPHABETICALLY SORTED --> <!-- ARM base requirements --> 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-conditional.xml b/t/android-5.15/android-base-conditional.xml index c58d3b1..3e76ae6 100644 --- a/t/android-5.15/android-base-conditional.xml +++ b/t/android-5.15/android-base-conditional.xml @@ -1,4 +1,4 @@ -<kernel minlts="5.15.0" /> +<kernel minlts="5.15.41" /> <!-- KEEP ALPHABETICALLY SORTED --> <!-- ARM base requirements --> 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 |