github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 15:02:45 +00:00
Code Issues Projects Releases Wiki Activity

kernel: Remove CONFIG_INET6 options from fragments

Browse Source 
Dont think these are options are required at all.
Remove them from fragments and whitelist.

Fixes #924

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
This commit is contained in:
Archana Shinde 2020-02-10 12:11:27 -08:00
parent 17d86c3c14
commit b66fb4389f
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/configs/fragments/common/network.conf
View File

@ -36,11 +36,6 @@ CONFIG_DEFAULT_BBR=y
CONFIG_TCP_MD5SIG=y
CONFIG_IPV6=y
CONFIG_IPV6_MULTIPLE_TABLES=y
# Once we move to 5.4, INET6_XFRM_MODE_* are not needed. I don't think these are actually needed, but
# for now we just place them in whitelist.conf:
CONFIG_INET6_XFRM_MODE_TRANSPORT=y
CONFIG_INET6_XFRM_MODE_TUNNEL=y
CONFIG_INET6_XFRM_MODE_BEET=y
CONFIG_STP=y
CONFIG_BRIDGE=y

3
kernel/configs/fragments/whitelist.conf
View File

@ -1,8 +1,5 @@
# configuration options which may dropped in newer kernels
# without generating an error in fragment merging
CONFIG_INET6_XFRM_MODE_BEET
CONFIG_INET6_XFRM_MODE_TRANSPORT
CONFIG_INET6_XFRM_MODE_TUNNEL
CONFIG_NF_NAT_IPV4
CONFIG_NF_NAT_NEEDED
CONFIG_NF_NAT_PROTO_DCCP

2
kernel/kata_config_version
View File

@ -1 +1 @@
64
65