aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-02 17:33:01 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-02 18:14:20 +0100
commit54fad3f32b06d27edb6419eeefa6e93f8b3846fa (patch)
tree3c6616072baecc2805e9b8dd1ec18c13cc81a0ee /target/linux
parent89a2a6c870e5ede1ebd4a63bf554c42b2d746b55 (diff)
downloadupstream-54fad3f32b06d27edb6419eeefa6e93f8b3846fa.tar.gz
upstream-54fad3f32b06d27edb6419eeefa6e93f8b3846fa.tar.bz2
upstream-54fad3f32b06d27edb6419eeefa6e93f8b3846fa.zip
kernel: add disabled CONFIG_IP6_NF_TARGET_MASQUERADE
In kernel commit adf82accc5f5 ("netfilter: x_tables: merge ip and ipv6 masquerade modules") the config symbols IP_NF_TARGET_MASQUERADE and IP6_NF_TARGET_MASQUERADE have been demoted to simple backwards- compat options for NETFILTER_XT_TARGET_MASQUERADE. In netfilter.mk, this has already been updated in OpenWrt commit d1592306cc07 ("netfilter.mk: use CONFIG_NETFILTER_XT_TARGET_MASQUERADE"), having us use the new config symbol. However, enabling IP_NF_NAT or IP6_NF_NAT still makes the relevant legacy options selectable, so we need to disable them in generic config (and forget about them afterwards). Since CONFIG_IP_NF_TARGET_MASQUERADE is already present there, this just adds the missing CONFIG_IP6_NF_TARGET_MASQUERADE. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/config-5.41
1 files changed, 1 insertions, 0 deletions
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 0be2288550..296e875a19 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -2380,6 +2380,7 @@ CONFIG_IO_STRICT_DEVMEM=y
# CONFIG_IP6_NF_RAW is not set
# CONFIG_IP6_NF_SECURITY is not set
# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_MASQUERADE is not set
# CONFIG_IP6_NF_TARGET_REJECT is not set
# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
# CONFIG_IPACK_BUS is not set