From 690a7a7faa3b3f05aa2c402c2100b136dff45816 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 1 Aug 2018 17:38:49 +0800 Subject: [PATCH] ARM: rockchip_defconfig: Add VTI support https://android.googlesource.com/kernel/configs 7a4e85661078 ("Enable options required by netd.") The netd in master requires some additional options to be enabled for the new (non-optional) XfrmController functionality. Change-Id: I3e96ef1e9b09758f4b8d149f9025573ff01e09ec Signed-off-by: Zhangbin Tong Signed-off-by: Tao Huang --- arch/arm/configs/rockchip_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index b637d1c583dd..047442a986e8 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -93,6 +93,7 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y +CONFIG_NET_IPVTI=y CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y @@ -105,6 +106,7 @@ CONFIG_INET6_AH=y CONFIG_INET6_ESP=y CONFIG_INET6_IPCOMP=y CONFIG_IPV6_MIP6=y +CONFIG_IPV6_VTI=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_NETFILTER=y