From: Yixun Lan <yixun.lan@amlogic.com>
Date: Fri, 25 May 2018 06:20:56 +0000 (+0800)
Subject: network: enable VTI option
X-Git-Tag: khadas-vims-v0.9.6-release~1900
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58c13404dfcc4d9efa2728f95f1636f468327608;p=platform%2Fkernel%2Flinux-amlogic.git

network: enable VTI option

PD#167119: network: enable VTI option

this is need by VtsKernelNetTests, otherwise some test cases will fail

Error info:
ERROR: testAddVti (xfrm_tunnel_test.XfrmAddDeleteVtiTest)
Test the creation of a Virtual Tunnel Interface.

Change-Id: I19b05d7684ab97245f02384c4f50cee349f76131
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
---

diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index a42e183..874bb14 100644
--- a/arch/arm64/configs/meson64_defconfig
+++ b/arch/arm64/configs/meson64_defconfig
@@ -76,6 +76,7 @@ CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
 CONFIG_NET_IPIP=y
 CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=y
 CONFIG_INET_ESP=y
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_IPV6_ROUTER_PREF=y
@@ -85,7 +86,7 @@ CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_TUNNEL=y
+CONFIG_IPV6_VTI=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=y