From: Yousong Zhou Date: Fri, 25 Sep 2020 15:02:05 +0000 (+0800) Subject: generic: 5.4: make nf nat masquerade in unset state by default X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4c2141535063b6fe61f36c9bffab7684a48344c5;p=openwrt%2Fstaging%2Fthess.git generic: 5.4: make nf nat masquerade in unset state by default Upstream linux 5.1 commit d1aca8ab ("netfilter: nat: merge ipv4 and ipv6 masquerade functionality") replaces the following 2 options - CONFIG_NF_NAT_MASQUERADE_IPV4 - CONFIG_NF_NAT_MASQUERADE_IPV6 with CONFIG_NF_NAT_MASQUERADE. The new option is one without prompt and will be selected by CONFIG_NETFILTER_XT_TARGET_MASQUERADE introduced still later in 5.2. Signed-off-by: Yousong Zhou --- diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 04fda5de24..b911efdf4e 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -3689,8 +3689,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y # CONFIG_NF_NAT_H323 is not set # CONFIG_NF_NAT_IPV6 is not set # CONFIG_NF_NAT_IRC is not set -CONFIG_NF_NAT_MASQUERADE_IPV4=y -CONFIG_NF_NAT_MASQUERADE_IPV6=y +# CONFIG_NF_NAT_MASQUERADE is not set # CONFIG_NF_NAT_NEEDED is not set # CONFIG_NF_NAT_PPTP is not set # CONFIG_NF_NAT_PROTO_GRE is not set