Autoload connection tracking helpers by default, add ftp to this list

SVN-Revision: 5857

diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile
index 82b8ae510b0359e52911bd75cdd2444767ce818d..da24c09bffefb0a5c86db44274e12918ad3f7f34 100644 (file)
--- a/openwrt/target/linux/linux-2.4/Makefile
+++ b/openwrt/target/linux/linux-2.4/Makefile
@@ -78,10 +78,10 @@ $(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\
 ))
 $(eval $(call KMOD_template,IPT_NAT_DEFAULT,ipt-nat-default,\
        $(foreach mod,$(IPT_NAT_DEFAULT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
-))
+,,,10,$(IPT_NAT_DEFAULT-m)))
 $(eval $(call KMOD_template,IPT_NAT,ipt-nat,\
        $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
-))
+,,,20,$(IPT_NAT_DEFAULT-m)))
 $(eval $(call KMOD_template,IPT_NAT_H323,ipt-nat-h323,\
        $(foreach mod,$(IPT_NAT_H323-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
 ,,,40,$(IPT_NAT_H323-m)))

diff --git a/openwrt/target/linux/netfilter.mk b/openwrt/target/linux/netfilter.mk
index 632ea30cc49178a010155404ca9260e5457b3009..41d39e3e7985bd6908d89606ebe3657c3a5c08b0 100644 (file)
--- a/openwrt/target/linux/netfilter.mk
+++ b/openwrt/target/linux/netfilter.mk
@@ -54,6 +54,8 @@ IPT_NAT-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE
 IPT_NAT-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR
 IPT_NAT-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT
 
+IPT_NAT_DEFAULT-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp
+IPT_NAT_DEFAULT-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp
 IPT_NAT_DEFAULT-$(CONFIG_IP_NF_TFTP) += ip_conntrack_tftp
 IPT_NAT_DEFAULT-$(CONFIG_IP_NF_NAT_TFTP) += ip_nat_tftp
 IPT_NAT_DEFAULT-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp