summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2018-05-28 16:20:06 +0100
committerAlistair Strachan <astrachan@google.com>2018-05-29 13:44:52 -0700
commit18932b51114bf370ed584aeb5dcd9ac6888a5b12 (patch)
treeef95b3d0cf7c5d3cfffe4acedfbf8faddb15de94
parent3ce8fc1c3eb63f156f94e6c78da28dcc5621bc23 (diff)
hikey_defconfig: hikey960_defconfig: Add xt_bpf support
This has been cherry-picked from the below change: https://android.googlesource.com/kernel/configs/+/771c38e1090eb832c1d9f6ef2b9c5d404669a744 Add xt_bpf support for android devices For device ship with P and kernel version is 4.9 or above, it should use xt_bpf to gather the per iface networkStats instead of reading the proc file of xt_qtaguid. Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org> Change-Id: I706631cbea2ac0680ca076cc071ab13bc1f6e4b1
-rw-r--r--arch/arm64/configs/hikey960_defconfig1
-rw-r--r--arch/arm64/configs/hikey_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/hikey960_defconfig b/arch/arm64/configs/hikey960_defconfig
index 3365f22526c6..cce49bfa4bbc 100644
--- a/arch/arm64/configs/hikey960_defconfig
+++ b/arch/arm64/configs/hikey960_defconfig
@@ -136,6 +136,7 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=y
CONFIG_NETFILTER_XT_TARGET_TRACE=y
CONFIG_NETFILTER_XT_TARGET_SECMARK=y
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_BPF=y
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
diff --git a/arch/arm64/configs/hikey_defconfig b/arch/arm64/configs/hikey_defconfig
index 28180641cb39..bd45b3273168 100644
--- a/arch/arm64/configs/hikey_defconfig
+++ b/arch/arm64/configs/hikey_defconfig
@@ -135,6 +135,7 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=y
CONFIG_NETFILTER_XT_TARGET_TRACE=y
CONFIG_NETFILTER_XT_TARGET_SECMARK=y
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_BPF=y
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y