diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2020-09-25 23:02:05 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2020-10-24 22:28:37 +0800 |
| commit | 4c2141535063b6fe61f36c9bffab7684a48344c5 (patch) | |
| tree | 09cdb57623048a6da8ea1600c502b624036c6b9c /target/linux | |
| parent | a5c10ba9809454226fea6dda175150bc17e793d5 (diff) | |
| download | upstream-4c2141535063b6fe61f36c9bffab7684a48344c5.tar.gz upstream-4c2141535063b6fe61f36c9bffab7684a48344c5.tar.bz2 upstream-4c2141535063b6fe61f36c9bffab7684a48344c5.zip | |
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 <yszhou4tech@gmail.com>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/config-5.4 | 3 |
1 files changed, 1 insertions, 2 deletions
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 |