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 /mk | |
| 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 'mk')
| -rw-r--r-- | mk/modules.mk | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index cb418057b..19070c365 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -470,6 +470,12 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_LOG,netfilter-xt-target-log,\ $(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack \ + $(MODULES_DIR)/kernel/net/netfilter/xt_conntrack \ +,41)) + +$(eval $(call KMOD_template,NF_NAT,nf-nat,\ + $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ + $(MODULES_DIR)/kernel/net/netfilter/xt_nat \ ,45)) $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ @@ -477,20 +483,10 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ ,46)) -ifeq ($(KERNEL_BASE),3) -ifeq ($(KERNEL_MAJ),4) -$(eval $(call KMOD_template,FULL_NAT,full-nat,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat \ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ -,50)) -else -$(eval $(call KMOD_template,FULL_NAT,full-nat,\ - $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ +$(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ ,50)) -endif -endif $(eval $(call KMOD_template,NF_CONNTRACK_FTP,nf-conntrack-ftp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_ftp \ |