From 2eec092862404683b25c6df909335b12a7288c3c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 21 Jun 2018 16:33:12 +0100 Subject: [PATCH] kernel: Adjust kernel configs Signed-off-by: Rolf Neugebauer --- kernel/config-4.14.x-aarch64 | 6 +++--- kernel/config-4.14.x-s390x | 6 +++--- kernel/config-4.14.x-x86_64 | 6 +++--- kernel/config-4.16.x-x86_64 | 7 +++---- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index 76bc5ddb9..6e26141b9 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -1060,6 +1060,9 @@ CONFIG_NF_CONNTRACK_IPV6=y # CONFIG_NF_SOCKET_IPV6 is not set CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_CHAIN_ROUTE_IPV6=y +CONFIG_NFT_CHAIN_NAT_IPV6=y +CONFIG_NFT_MASQ_IPV6=y +CONFIG_NFT_REDIR_IPV6=y CONFIG_NFT_REJECT_IPV6=y CONFIG_NFT_DUP_IPV6=y # CONFIG_NFT_FIB_IPV6 is not set @@ -1067,10 +1070,7 @@ CONFIG_NF_DUP_IPV6=y CONFIG_NF_REJECT_IPV6=y CONFIG_NF_LOG_IPV6=y CONFIG_NF_NAT_IPV6=y -CONFIG_NFT_CHAIN_NAT_IPV6=y CONFIG_NF_NAT_MASQUERADE_IPV6=y -CONFIG_NFT_MASQ_IPV6=y -CONFIG_NFT_REDIR_IPV6=y CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=y CONFIG_IP6_NF_MATCH_EUI64=y diff --git a/kernel/config-4.14.x-s390x b/kernel/config-4.14.x-s390x index ff84b1b1a..755fc4ee3 100644 --- a/kernel/config-4.14.x-s390x +++ b/kernel/config-4.14.x-s390x @@ -999,6 +999,9 @@ CONFIG_NF_CONNTRACK_IPV6=y # CONFIG_NF_SOCKET_IPV6 is not set CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_CHAIN_ROUTE_IPV6=y +CONFIG_NFT_CHAIN_NAT_IPV6=y +CONFIG_NFT_MASQ_IPV6=y +CONFIG_NFT_REDIR_IPV6=y CONFIG_NFT_REJECT_IPV6=y CONFIG_NFT_DUP_IPV6=y # CONFIG_NFT_FIB_IPV6 is not set @@ -1006,10 +1009,7 @@ CONFIG_NF_DUP_IPV6=y CONFIG_NF_REJECT_IPV6=y CONFIG_NF_LOG_IPV6=y CONFIG_NF_NAT_IPV6=y -CONFIG_NFT_CHAIN_NAT_IPV6=y CONFIG_NF_NAT_MASQUERADE_IPV6=y -CONFIG_NFT_MASQ_IPV6=y -CONFIG_NFT_REDIR_IPV6=y CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=y CONFIG_IP6_NF_MATCH_EUI64=y diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index d25c8c563..bb9833b78 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -1219,6 +1219,9 @@ CONFIG_NF_CONNTRACK_IPV6=y # CONFIG_NF_SOCKET_IPV6 is not set CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_CHAIN_ROUTE_IPV6=y +CONFIG_NFT_CHAIN_NAT_IPV6=y +CONFIG_NFT_MASQ_IPV6=y +CONFIG_NFT_REDIR_IPV6=y CONFIG_NFT_REJECT_IPV6=y CONFIG_NFT_DUP_IPV6=y # CONFIG_NFT_FIB_IPV6 is not set @@ -1226,10 +1229,7 @@ CONFIG_NF_DUP_IPV6=y CONFIG_NF_REJECT_IPV6=y CONFIG_NF_LOG_IPV6=y CONFIG_NF_NAT_IPV6=y -CONFIG_NFT_CHAIN_NAT_IPV6=y CONFIG_NF_NAT_MASQUERADE_IPV6=y -CONFIG_NFT_MASQ_IPV6=y -CONFIG_NFT_REDIR_IPV6=y CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=y CONFIG_IP6_NF_MATCH_EUI64=y diff --git a/kernel/config-4.16.x-x86_64 b/kernel/config-4.16.x-x86_64 index 89a759175..2acd8ea9b 100644 --- a/kernel/config-4.16.x-x86_64 +++ b/kernel/config-4.16.x-x86_64 @@ -1235,6 +1235,9 @@ CONFIG_NF_CONNTRACK_IPV6=y # CONFIG_NF_SOCKET_IPV6 is not set CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_CHAIN_ROUTE_IPV6=y +CONFIG_NFT_CHAIN_NAT_IPV6=y +CONFIG_NFT_MASQ_IPV6=y +CONFIG_NFT_REDIR_IPV6=y CONFIG_NFT_REJECT_IPV6=y CONFIG_NFT_DUP_IPV6=y # CONFIG_NFT_FIB_IPV6 is not set @@ -1242,10 +1245,7 @@ CONFIG_NF_DUP_IPV6=y CONFIG_NF_REJECT_IPV6=y CONFIG_NF_LOG_IPV6=y CONFIG_NF_NAT_IPV6=y -CONFIG_NFT_CHAIN_NAT_IPV6=y CONFIG_NF_NAT_MASQUERADE_IPV6=y -CONFIG_NFT_MASQ_IPV6=y -CONFIG_NFT_REDIR_IPV6=y CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=y CONFIG_IP6_NF_MATCH_EUI64=y @@ -3158,7 +3158,6 @@ CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WIRELESS is not set # CONFIG_ACERHDF is not set # CONFIG_DELL_SMBIOS is not set -# CONFIG_DELL_WMI is not set # CONFIG_DELL_WMI_AIO is not set # CONFIG_DELL_SMO8800 is not set # CONFIG_FUJITSU_TABLET is not set