diff options
| author | Maciej Żenczykowski <maze@google.com> | 2019-02-14 15:32:55 -0800 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2019-09-16 13:09:02 +0530 |
| commit | ae792083e73072e89b8725e4e1e9e63cd77dbab6 (patch) | |
| tree | 00374994c9c7966b54d33edc57d6af68a8afb490 /arch | |
| parent | 840ca4d7d9b7f0e70ddcb434f110db65daf9ff42 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index c8d94c22de14..4057561e8ec6 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 540729ea7a70..538da565c15a 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 |