From 3c06e2a90a2fc048e6ecf7634f87b238b7814ce2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 19 May 2015 17:01:46 -0500
Subject: update netfilter configs, enable support for 3.14 kernels

---
 mk/modules-3.14.mk | 3 +++
 mk/modules-3.18.mk | 3 +++
 mk/modules.mk      | 9 +++------
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'mk')

diff --git a/mk/modules-3.14.mk b/mk/modules-3.14.mk
index 2e3f99027..7a901ca5d 100644
--- a/mk/modules-3.14.mk
+++ b/mk/modules-3.14.mk
@@ -3,3 +3,6 @@
 
 USBMODULES:=drivers/usb/usb-common drivers/usb/core/usbcore
 USBUDC:=gadget
+NF_NAT_MASQ:=net/ipv4/netfilter/nf_nat_ipv4
+NF_REJECT:=net/ipv4/netfilter/ipt_REJECT
+LOCKD:=fs/lockd/lockd
diff --git a/mk/modules-3.18.mk b/mk/modules-3.18.mk
index a4f7f84b3..46da18a74 100644
--- a/mk/modules-3.18.mk
+++ b/mk/modules-3.18.mk
@@ -3,3 +3,6 @@
 
 USBMODULES:=drivers/usb/common/usb-common drivers/usb/core/usbcore
 USBUDC:=gadget/udc
+NF_NAT_MASQ:=net/ipv4/netfilter/nf_nat_ipv4 net/ipv4/netfilter/nf_nat_masquerade_ipv4
+NF_REJECT:=net/ipv4/netfilter/ipt_REJECT net/ipv4/netfilter/nf_reject_ipv4
+LOCKD:=fs/nfs_common/grace fs/lockd/lockd
diff --git a/mk/modules.mk b/mk/modules.mk
index 764dbb01d..91b31f0dd 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -499,8 +499,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\
 ,46))
 
 $(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/nf_nat_masquerade_ipv4 \
+	$(foreach mod, $(NF_NAT_MASQ),$(MODULES_DIR)/kernel/$(mod)) \
 ,50))
 
 $(eval $(call KMOD_template,IP_NF_NAT,ip-nf-nat,\
@@ -601,8 +600,7 @@ $(eval $(call KMOD_template,IP_NF_FILTER,ip-nf-filter,\
 ,55))
 
 $(eval $(call KMOD_template,IP_NF_TARGET_REJECT,ip-nf-target-reject,\
-	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_reject_ipv4 \
-	$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REJECT \
+	$(foreach mod, $(NF_REJECT),$(MODULES_DIR)/kernel/$(mod)) \
 ,60))
 
 $(eval $(call KMOD_template,IP_NF_TARGET_TCPMSS,ip-nf-target-tcpmss,\
@@ -1114,8 +1112,7 @@ $(eval $(call KMOD_template,RPCSEC_GSS_KRB5,rpcsec-gss-krb5,\
 ,26))
 
 $(eval $(call KMOD_template,LOCKD,lockd,\
-	$(MODULES_DIR)/kernel/fs/nfs_common/grace \
-	$(MODULES_DIR)/kernel/fs/lockd/lockd \
+	$(foreach mod, $(LOCKD),$(MODULES_DIR)/kernel/$(mod)) \
 ,27))
 
 ifneq ($(ADK_KERNEL_NFS_FS),y)
-- 
cgit v1.2.3