From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 20 Apr 2015 13:36:02 +0000 (+0000)
Subject: netfilter.mk: move IRC conntrack/nat helpers to kmod-nf-nathelper-extra
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=391387eb69424b7cb40f473b8183e20d2d61a1d8;p=openwrt%2Fstaging%2Fjow.git

netfilter.mk: move IRC conntrack/nat helpers to kmod-nf-nathelper-extra

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45515
---

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 22179ca05c..8be8fdaa84 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -202,9 +202,7 @@ $(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_XT)xt_NETMAP)
 
 $(eval $(call nf_add,NF_NATHELPER,CONFIG_IP_NF_NAT_FTP, $(P_V4)ip_nat_ftp))
 $(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_CONNTRACK_FTP, $(P_XT)nf_conntrack_ftp))
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_conntrack_irc))
 $(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp))
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc))
 
 
 # nathelper-extra
@@ -224,6 +222,8 @@ $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_SNMP, $(P_XT)nf_conn
 $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_SNMP_BASIC, $(P_V4)nf_nat_snmp_basic))
 $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_TFTP, $(P_XT)nf_conntrack_tftp))
 $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_TFTP, $(P_XT)nf_nat_tftp))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_conntrack_irc))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc))
 
 
 # ulog