summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2019-01-15 16:35:27 -0800
committerMaciej Żenczykowski <maze@google.com>2019-01-16 00:44:32 +0000
commita10e61236fa2ad0ec42084e309c3338c5d0eb329 (patch)
tree248a51f1116b2db46045d37391eb257983470cb1
parent3aa15d6782d7d621ae54a54b8eaccaada6c969b4 (diff)
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 27c9ff92561b..40332ac3f094 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -179,6 +179,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 8869844e557b..c2a172bb8fec 100644
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -187,6 +187,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