diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 18:13:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 18:13:16 +0200 |
| commit | 2bc97af1f4ca05f1e2ffb9c50b8ef717bc2c33a3 (patch) | |
| tree | 65807b0e8e3475edaa949eb69253c81a65948262 /mk/modules.mk | |
| parent | 24de0984ed3caa1eb5bdf4d9d4e0b9900e6254eb (diff) | |
| parent | d4ae4b9c31f562aa4cd39b51d6d44ec07ac36f26 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/modules.mk')
| -rw-r--r-- | mk/modules.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 3df7b63dc..0dcc1f9e7 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -443,11 +443,22 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ ,50)) -$(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\ +NAT:=NF_NAT_IPV4 +ifeq ($(KERNEL_BASE),3) +ifeq ($(KERNEL_MAJ),4) +NAT:=NF_NAT +$(eval $(call KMOD_template,$(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,$(NAT),full-nat,\ $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ $(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 \ |