From c12ab9fbac68ef1347f323c4ec1e447402ed84fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 14 Feb 2019 15:32:55 -0800 Subject: [PATCH] ANDROID: cuttlefish: enable CONFIG_NET_SCH_NETEM=y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is to mirror: https://android-review.googlesource.com/c/kernel/configs/+/906713 android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config Generated via: echo 'CONFIG_NET_SCH_NETEM=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig echo 'CONFIG_NET_SCH_NETEM=y' >> arch/arm64/configs/cuttlefish_defconfig make ARCH=x86_64 x86_64_cuttlefish_defconfig make ARCH=x86_64 savedefconfig cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig make ARCH=arm64 cuttlefish_defconfig make ARCH=arm64 savedefconfig cat defconfig > arch/arm64/configs/cuttlefish_defconfig rm defconfig Bug: 124467469 Signed-off-by: Maciej Żenczykowski Change-Id: If06da8f0e77d5523c56fea5d520131e456f9b529 --- arch/arm64/configs/cuttlefish_defconfig | 1 + arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 87a90ea32c2d..622db3a8c04b 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -178,6 +178,7 @@ CONFIG_IP6_NF_RAW=y CONFIG_L2TP=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_NETEM=y CONFIG_NET_CLS_U32=y CONFIG_NET_CLS_BPF=y CONFIG_NET_EMATCH=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index e889c64f64f8..e8da56181903 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -183,6 +183,7 @@ CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_NETEM=y CONFIG_NET_CLS_U32=y CONFIG_NET_CLS_BPF=y CONFIG_NET_EMATCH=y