From a5a2026784cc353e5bbced78b8484e46e92ad431 Mon Sep 17 00:00:00 2001
From: Eashwar Ranganathan <eashwar@eashwar.com>
Date: Mon, 23 Nov 2020 23:59:46 -0800
Subject: [PATCH] feat: enable NF_CONNTRACK_TFTP in the kernel

Update kernel configs.

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
---
 kernel/kernel/config-amd64 |  3 ++-
 kernel/kernel/config-arm64 | 11 ++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/kernel/kernel/config-amd64 b/kernel/kernel/config-amd64
index 87c5a3da6..c244e4ee9 100644
--- a/kernel/kernel/config-amd64
+++ b/kernel/kernel/config-amd64
@@ -1088,7 +1088,7 @@ CONFIG_NF_CONNTRACK_SNMP=y
 CONFIG_NF_CONNTRACK_PPTP=y
 CONFIG_NF_CONNTRACK_SANE=y
 CONFIG_NF_CONNTRACK_SIP=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
+CONFIG_NF_CONNTRACK_TFTP=y
 CONFIG_NF_CT_NETLINK=y
 # CONFIG_NF_CT_NETLINK_HELPER is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
@@ -1096,6 +1096,7 @@ CONFIG_NF_NAT=y
 CONFIG_NF_NAT_FTP=y
 CONFIG_NF_NAT_IRC=y
 CONFIG_NF_NAT_SIP=y
+CONFIG_NF_NAT_TFTP=y
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=y
diff --git a/kernel/kernel/config-arm64 b/kernel/kernel/config-arm64
index 2ca8fa9d9..5e68dbfad 100644
--- a/kernel/kernel/config-arm64
+++ b/kernel/kernel/config-arm64
@@ -800,10 +800,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1166,7 +1162,7 @@ CONFIG_NF_CONNTRACK_SNMP=y
 CONFIG_NF_CONNTRACK_PPTP=y
 CONFIG_NF_CONNTRACK_SANE=y
 CONFIG_NF_CONNTRACK_SIP=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
+CONFIG_NF_CONNTRACK_TFTP=y
 CONFIG_NF_CT_NETLINK=y
 # CONFIG_NF_CT_NETLINK_HELPER is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
@@ -1174,6 +1170,7 @@ CONFIG_NF_NAT=y
 CONFIG_NF_NAT_FTP=y
 CONFIG_NF_NAT_IRC=y
 CONFIG_NF_NAT_SIP=y
+CONFIG_NF_NAT_TFTP=y
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=y
@@ -6031,10 +6028,6 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization