diff options
| author | Phil Sutter <phil@nwl.cc> | 2014-06-17 03:07:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-18 09:10:35 +0200 |
| commit | 10af76efc1d5e707fd16342c5d835b54b02695c2 (patch) | |
| tree | 6c0a199103180b9425093f1c25164444c44d8b44 /target/linux | |
| parent | cf6d746fb466608f77fa77b7fefcaac2f7c5c96b (diff) | |
target/linux/config: fixup (IPv4) NAT support
- add missing xt_conntrack.ko
- conntrack needs to be loaded before NAT
- add generic nf_nat.ko and xt_nat.ko
- drop linux-3.4 compat case
- fix symbol names for conntrack and connmark matches
- fix for non-existing FULL_NAT symbol
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.netfilter | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netfilter.ip4 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index 6ba9f0219..13f64d957 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -125,11 +125,11 @@ config ADK_KERNEL_NETFILTER_XT_MATCH_STATE # cannot be ADK_KERNEL_IP_NF_MATCH_CONNTRACK because # netfilter is built as a module -> this'll always be # a module, too -config ADK_KERNEL_IP_NF_MATCH_CONNTRACK +config ADK_KERNEL_NETFILTER_XT_MATCH_CONNTRACK tristate default n -config ADK_KERNEL_IP_NF_MATCH_CONNMARK +config ADK_KERNEL_NETFILTER_XT_MATCH_CONNMARK tristate default n diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index 075fabd1c..d26e61b8e 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -2,6 +2,7 @@ config ADK_KERNEL_NF_CONNTRACK_IPV4 prompt 'IPv4 connection tracking support (required for NAT)' tristate select ADK_KERNEL_NF_CONNTRACK + select ADK_KERNEL_NETFILTER_XT_MATCH_CONNTRACK default m if ADK_PACKAGE_IPTABLES default n help @@ -61,7 +62,7 @@ config ADK_KERNEL_NF_NAT_IPV4 config ADK_KERNEL_IP_NF_TARGET_MASQUERADE tristate 'MASQUERADE target support' - depends on ADK_KERNEL_FULL_NAT + depends on ADK_KERNEL_NF_NAT default m if ADK_PACKAGE_IPTABLES default n help @@ -99,7 +100,7 @@ config ADK_KERNEL_IP_NF_TARGET_ULOG config ADK_KERNEL_IP_NF_TARGET_REDIRECT tristate 'REDIRECT target support' - depends on ADK_KERNEL_FULL_NAT + depends on ADK_KERNEL_NF_NAT help REDIRECT is a special case of NAT: all incoming connections are mapped onto the incoming interface's address, causing the packets to @@ -108,7 +109,7 @@ config ADK_KERNEL_IP_NF_TARGET_REDIRECT config ADK_KERNEL_IP_NF_TARGET_NETMAP tristate 'NETMAP target support' - depends on ADK_KERNEL_FULL_NAT + depends on ADK_KERNEL_NF_NAT help NETMAP is an implementation of static 1:1 NAT mapping of network addresses. It maps the network address part, while keeping the host @@ -117,7 +118,6 @@ config ADK_KERNEL_IP_NF_TARGET_NETMAP config ADK_KERNEL_IP_NF_MANGLE tristate 'Packet mangling' - depends on ADK_KERNEL_FULL_NAT help This option adds a `mangle' table to iptables: see the man page for iptables(8). This table is used for various packet alterations |