From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 18 Nov 2012 21:18:37 +0000 (+0000)
Subject: kernel: fix loading of nf_nat_irc
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d648dad7fa7708a1879579ac6a6e87825eccd028;p=openwrt%2Fstaging%2Fjow.git

kernel: fix loading of nf_nat_irc

nf_nat_irc depends on nf_conntrack_irc and it should be defined after that.
This fixes a problem introduced in r34247.

SVN-Revision: 34251
---

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 7f0078d76f..ef38d50ad8 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -174,6 +174,7 @@ $(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_REDIRECT, $(P_V4)ipt_REDI
 
 $(eval $(call nf_add,IPT_NATHELPER,CONFIG_IP_NF_NAT_FTP, $(P_V4)ip_nat_ftp))
 $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_CONNTRACK_FTP, $(P_XT)nf_conntrack_ftp))
+$(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_conntrack_irc))
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
   $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp))
   $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc))
@@ -181,7 +182,6 @@ else
   $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_V4)nf_nat_ftp))
   $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_V4)nf_nat_irc))
 endif
-$(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_conntrack_irc))
 
 
 # nathelper-extra