github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-16 08:26:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #231 from Weichen81/master

Browse Source 
kernel: configs: Disable IPv6-in-IPv4 tunnel in guest kernel for Arm64
This commit is contained in:
Julio Montes 2018-10-18 09:20:29 -05:00 committed by GitHub
commit 96ed56ec3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/configs/arm64_kata_kvm_4.14.x
View File

@ -636,17 +636,16 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_IP_PNP_RARP is not set # CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set # CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE_DEMUX 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_IP_MROUTE is not set
# CONFIG_SYN_COOKIES is not set # CONFIG_SYN_COOKIES is not set
# CONFIG_NET_UDP_TUNNEL is not set # CONFIG_NET_UDP_TUNNEL is not set
# CONFIG_NET_FOU 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_AH is not set
# CONFIG_INET_ESP is not set # CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set # CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL 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_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET 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_BEET=y
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
# CONFIG_IPV6_VTI is not set # CONFIG_IPV6_VTI is not set
CONFIG_IPV6_SIT=y # CONFIG_IPV6_SIT is not set
# CONFIG_IPV6_SIT_6RD is not set
CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_TUNNEL is not set # CONFIG_IPV6_TUNNEL is not set
# CONFIG_IPV6_FOU is not set # CONFIG_IPV6_FOU is not set
# CONFIG_IPV6_FOU_TUNNEL 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_PSAMPLE is not set
# CONFIG_NET_IFE is not set # CONFIG_NET_IFE is not set
# CONFIG_LWTUNNEL is not set # CONFIG_LWTUNNEL is not set
CONFIG_DST_CACHE=y # CONFIG_DST_CACHE is not set
CONFIG_GRO_CELLS=y CONFIG_GRO_CELLS=y
# CONFIG_NET_DEVLINK is not set # CONFIG_NET_DEVLINK is not set
CONFIG_MAY_USE_DEVLINK=y CONFIG_MAY_USE_DEVLINK=y

2
kernel/kata_config_version
View File

@ -1 +1 @@
15 16