diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-27 23:40:21 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-12-15 14:28:50 +0100 |
| commit | f8916707045170b2509c34f0d72f9bb4dae463f6 (patch) | |
| tree | 8be903561823e31852162c4a77daefff9f48e233 /target/linux/generic | |
| parent | f72f793c9e61b8a55eb8c162b71a6d8860906a4e (diff) | |
| download | upstream-f8916707045170b2509c34f0d72f9bb4dae463f6.tar.gz upstream-f8916707045170b2509c34f0d72f9bb4dae463f6.tar.bz2 upstream-f8916707045170b2509c34f0d72f9bb4dae463f6.zip | |
kernel: netfilter: Adapt merge ipv4/ipv6 masquerade code
In kernel commit 0168e8b361 ("netfilter: nat: merge ipv4/ipv6 masquerade
code into main nat module") the CONFIG_NF_NAT_MASQUERADE_IPV4 and
CONFIG_NF_NAT_MASQUERADE_IPV6 kernel configuration option were changed
to bool and the code will not be compiled as a own module any more, but
it will be integrated into nf_nat_ipv4.ko or nf_nat_ipv6.ko to save some
memory.
Activate these options as bool in the generic kernel 4.19 configuration
only, to always build them into the nf_nat_ipv*.ko modules. The kmod
file will still try to select them as module, but the generic
configuration will not be overwritten.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/config-4.19 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index 7171c2e478..f57824de86 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -3357,8 +3357,8 @@ 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 is not set -# CONFIG_NF_NAT_MASQUERADE_IPV6 is not set +CONFIG_NF_NAT_MASQUERADE_IPV4=y +CONFIG_NF_NAT_MASQUERADE_IPV6=y # CONFIG_NF_NAT_NEEDED is not set # CONFIG_NF_NAT_PPTP is not set # CONFIG_NF_NAT_PROTO_GRE is not set |