aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2019-01-15 16:35:27 -0800
committerAmit Pundir <amit.pundir@linaro.org>2019-02-15 12:34:40 +0530
commit964cc5ed63dc2897c01784ace55a82d05785b55d (patch)
treed646f0fd3032128acb6065396ba85e37ff7d4bec
parent4f0b75fa93d557650965084eec50232e743dc058 (diff)
downloadkernel_replicant_linux-964cc5ed63dc2897c01784ace55a82d05785b55d.tar.gz
kernel_replicant_linux-964cc5ed63dc2897c01784ace55a82d05785b55d.tar.bz2
kernel_replicant_linux-964cc5ed63dc2897c01784ace55a82d05785b55d.zip
ANDROID: cuttlefish: enable CONFIG_NET_CLS_BPF=y
This is to mirror https://android-review.googlesource.com/c/kernel/configs/+/870517 android-4.9+: add CONFIG_NET_CLS_BPF to base Generated via: echo 'CONFIG_NET_CLS_BPF=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig echo 'CONFIG_NET_CLS_BPF=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 Bug: 65674744 Change-Id: I8e4dfe7a99d38fd5942001a1aab83b7ac9df30dd Signed-off-by: Maciej Żenczykowski <maze@google.com>
-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 2850009bb8e1..b7d03af273ce 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -176,6 +176,7 @@ CONFIG_L2TP=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=y
CONFIG_NET_CLS_U32=y
+CONFIG_NET_CLS_BPF=y
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_U32=y
CONFIG_NET_CLS_ACT=y
diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig
index 90d73c393f91..f4544e8fec1b 100644
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -183,6 +183,7 @@ CONFIG_IP6_NF_RAW=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=y
CONFIG_NET_CLS_U32=y
+CONFIG_NET_CLS_BPF=y
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_U32=y
CONFIG_NET_CLS_ACT=y