From 1d993c09180d71905545b20ec5b8794f1d8a29bb Mon Sep 17 00:00:00 2001 From: Wei Chen Date: Thu, 18 Oct 2018 05:29:43 +0000 Subject: [PATCH] kernel: configs: Disable IPv6-in-IPv4 tunnel in guest kernel for Arm64 As discussed in issue #171 IPv6-in-IPv4 tunnel is useless in guest. So we decide to disable the CONFIG_IPV6_SIT by default for Arm64. Fixed #230 Signed-off-by: Wei Chen --- kernel/configs/arm64_kata_kvm_4.14.x | 11 ++++------- kernel/kata_config_version | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kernel/configs/arm64_kata_kvm_4.14.x b/kernel/configs/arm64_kata_kvm_4.14.x index 1aa203e109..f06ed91611 100644 --- a/kernel/configs/arm64_kata_kvm_4.14.x +++ b/kernel/configs/arm64_kata_kvm_4.14.x @@ -636,17 +636,16 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set -CONFIG_NET_IP_TUNNEL=y +# CONFIG_NET_IP_TUNNEL is not set # CONFIG_IP_MROUTE is not set # CONFIG_SYN_COOKIES is not set # CONFIG_NET_UDP_TUNNEL is not set # CONFIG_NET_FOU is not set -# CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=y +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -687,9 +686,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_INET6_XFRM_MODE_BEET=y # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set # CONFIG_IPV6_VTI is not set -CONFIG_IPV6_SIT=y -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_SIT is not set # CONFIG_IPV6_TUNNEL is not set # CONFIG_IPV6_FOU is not set # CONFIG_IPV6_FOU_TUNNEL is not set @@ -972,7 +969,7 @@ CONFIG_NET_9P_VIRTIO=y # CONFIG_PSAMPLE is not set # CONFIG_NET_IFE is not set # CONFIG_LWTUNNEL is not set -CONFIG_DST_CACHE=y +# CONFIG_DST_CACHE is not set CONFIG_GRO_CELLS=y # CONFIG_NET_DEVLINK is not set CONFIG_MAY_USE_DEVLINK=y diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 60d3b2f4a4..b6a7d89c68 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -15 +16