From b66fb4389f8f85cb977bc310a0f57ad9bd950df9 Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Mon, 10 Feb 2020 12:11:27 -0800 Subject: [PATCH] kernel: Remove CONFIG_INET6 options from fragments Dont think these are options are required at all. Remove them from fragments and whitelist. Fixes #924 Signed-off-by: Archana Shinde --- kernel/configs/fragments/common/network.conf | 5 ----- kernel/configs/fragments/whitelist.conf | 3 --- kernel/kata_config_version | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/kernel/configs/fragments/common/network.conf b/kernel/configs/fragments/common/network.conf index dd1c119bc3..b8d49ae7c4 100644 --- a/kernel/configs/fragments/common/network.conf +++ b/kernel/configs/fragments/common/network.conf @@ -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 diff --git a/kernel/configs/fragments/whitelist.conf b/kernel/configs/fragments/whitelist.conf index 0c0e706bb8..ea8845ebf3 100644 --- a/kernel/configs/fragments/whitelist.conf +++ b/kernel/configs/fragments/whitelist.conf @@ -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 diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 900731ffd5..1479e19b5f 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -64 +65