summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBenedict Wong <benedictwong@google.com>2019-02-13 11:11:10 -0800
committerAmit Pundir <amit.pundir@linaro.org>2019-09-16 13:09:02 +0530
commit840ca4d7d9b7f0e70ddcb434f110db65daf9ff42 (patch)
tree52bdd0ffb2a4847a04f80b8350186656b7da236b /arch
parentcd81cffd99078fefc1e49efa3e69d404c2dda3c2 (diff)
ANDROID: Add XFRM-I to cuttlefish defconfigs
This change adds XFRM Interfaces to all cuttlefish defconfigs for android 4.19 kernels. Bug: 124382806 Test: Kernel tests passing Change-Id: Iae45059eae43dd76b0c9291c13484043a4aaa1d3 Signed-off-by: Benedict Wong <benedictwong@google.com> [AmitP: Added ANDROID tag in the commit headline] Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'arch')
-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 d2207329e6e6..c8d94c22de14 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -82,6 +82,7 @@ CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_XFRM_USER=y
+CONFIG_XFRM_INTERFACE=y
CONFIG_NET_KEY=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig
index e889c64f64f8..540729ea7a70 100644
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -81,6 +81,7 @@ CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_XFRM_USER=y
+CONFIG_XFRM_INTERFACE=y
CONFIG_NET_KEY=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y