diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2018-05-28 16:50:47 +0100 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2018-05-29 13:44:52 -0700 |
| commit | e03078928f3e26fc35961b95b5d6db875f015d20 (patch) | |
| tree | 85a55677befc7257bb4088d25cad8bf8d1f22023 | |
| parent | 66646e490fb4c24ff89a5a6a122a58aa6b9d9775 (diff) | |
hikey960/hikey_defconfig: enable NET_IPVTI and IPV6_VTI
Original patch for 4.9 kernel:
https://android-review.googlesource.com/c/kernel/hikey-linaro/+/692304
hikey_defconfig: enable NET_IPVTI and IPV6_VTI
enable the Virtual (secure) IP: tunneling function for both IPv4 and IPv6.
This function is required by the VtsKernelNetdTest#BinderTest.TestVirtualTunnelInterface test.
Test: manually run vts-kernel -m VtsKernelNetdTest -t VtsKernelNetdTest#BinderTest.TestVirtualTunnelInterface on HiKey
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
Change-Id: I638871b7fb6367522307f96507152607be356fd9
| -rw-r--r-- | arch/arm64/configs/hikey960_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm64/configs/hikey_defconfig | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/hikey960_defconfig b/arch/arm64/configs/hikey960_defconfig index 0c4d1e1946b5..aa1116824c61 100644 --- a/arch/arm64/configs/hikey960_defconfig +++ b/arch/arm64/configs/hikey960_defconfig @@ -97,6 +97,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPVTI=y CONFIG_INET_ESP=y CONFIG_INET_DIAG_DESTROY=y CONFIG_IPV6_ROUTER_PREF=y @@ -106,6 +107,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_NETLABEL=y CONFIG_NETFILTER=y diff --git a/arch/arm64/configs/hikey_defconfig b/arch/arm64/configs/hikey_defconfig index 2caff4b148f7..6b9efed0fd17 100644 --- a/arch/arm64/configs/hikey_defconfig +++ b/arch/arm64/configs/hikey_defconfig @@ -107,6 +107,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_NETLABEL=y CONFIG_NETFILTER=y |