diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 18:49:18 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 18:49:18 +0200 |
| commit | ff567500eec3a72345674de5cda5c1bd327c1145 (patch) | |
| tree | 0f50a9aaa514701a1a607e6334ff24565383d176 | |
| parent | a98d5eede75bc0f7e75f1a4b9ed13c58f58a5207 (diff) | |
| parent | 749f6a9cae3114c9b8fd86ada0c0fd4ae5f54ab4 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/modules.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 0dcc1f9e7..70a17f429 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -441,18 +441,16 @@ $(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_defrag_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ -,50)) +,46)) -NAT:=NF_NAT_IPV4 ifeq ($(KERNEL_BASE),3) ifeq ($(KERNEL_MAJ),4) -NAT:=NF_NAT -$(eval $(call KMOD_template,$(NAT),full-nat,\ +$(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,$(NAT),full-nat,\ +$(eval $(call KMOD_template,FULL_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 \ @@ -510,7 +508,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_SIP,nf-conntrack-sip,\ $(eval $(call KMOD_template,IP_NF_IPTABLES,ip-nf-iptables,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_tables \ -,50)) +,49)) $(eval $(call KMOD_template,IP_NF_MATCH_IPRANGE,ip-nf-match-iprange,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_iprange \ |