aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2019-02-14 15:32:55 -0800
committerAmit Pundir <amit.pundir@linaro.org>2019-02-15 12:39:27 +0530
commitc4668cbd6accdfc9ec796c168538be314d21e8e6 (patch)
tree7473ddf0b0eeeb3c9fde2f9d2b3e90e3bd7a144c
parentcfa85c225d413c6d311ca4f6a1a3821860768758 (diff)
downloadkernel_replicant_linux-c4668cbd6accdfc9ec796c168538be314d21e8e6.tar.gz
kernel_replicant_linux-c4668cbd6accdfc9ec796c168538be314d21e8e6.tar.bz2
kernel_replicant_linux-c4668cbd6accdfc9ec796c168538be314d21e8e6.zip
ANDROID: cuttlefish: enable CONFIG_NET_SCH_NETEM=y
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 <maze@google.com> Change-Id: If06da8f0e77d5523c56fea5d520131e456f9b529
-rw-r--r--arch/arm64/configs/cuttlefish_defconfig1
-rw-r--r--arch/x86/configs/x86_64_cuttlefish_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig
index f79fe5d7653c..fb4ba7424237 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -177,6 +177,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 9afb6f436c50..8229cf8e66ea 100644
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -184,6 +184,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