android-4.9+ for Q: require CONFIG_NET_SCH_INGRESS=y
This enables the ingress qdisc which is the older version of
the clsact qdisc (which is implemented in the same file) and is
required by netd/clatcontroller on Q+.
(This was missed since this was already enabled on pixel devices
and was only picked up during cuttlefish unit testing)
Bug: 65674744
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1477ed3f35a617137034cd93eeb5fcf04c51fe72
(cherry picked from commit 994b6221dc7addbcb61f3b887c3363547a12c323)
diff --git a/android-4.14/android-base.config b/android-4.14/android-base.config
index e4b3ddd..28966ef 100644
--- a/android-4.14/android-base.config
+++ b/android-4.14/android-base.config
@@ -149,6 +149,7 @@
CONFIG_NET_KEY=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_INGRESS=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CONNTRACK_AMANDA=y
CONFIG_NF_CONNTRACK_EVENTS=y
diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config
index cf01de4..0092a54 100644
--- a/android-4.19/android-base.config
+++ b/android-4.19/android-base.config
@@ -146,6 +146,7 @@
CONFIG_NET_KEY=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_INGRESS=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CONNTRACK_AMANDA=y
CONFIG_NF_CONNTRACK_EVENTS=y
diff --git a/android-4.9/android-base.config b/android-4.9/android-base.config
index 060aafa..8da9f1f 100644
--- a/android-4.9/android-base.config
+++ b/android-4.9/android-base.config
@@ -150,6 +150,7 @@
CONFIG_NET_KEY=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_INGRESS=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CONNTRACK_AMANDA=y
CONFIG_NF_CONNTRACK_EVENTS=y
