aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-11-18 21:18:37 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-11-18 21:18:37 +0000
commitd648dad7fa7708a1879579ac6a6e87825eccd028 (patch)
tree039bd311294aacbafcf1e7dd7e465c63e984a802 /include
parentdb763080f4019fce18b97e0b55ff0f0f207920f5 (diff)
downloadupstream-d648dad7fa7708a1879579ac6a6e87825eccd028.tar.gz
upstream-d648dad7fa7708a1879579ac6a6e87825eccd028.tar.bz2
upstream-d648dad7fa7708a1879579ac6a6e87825eccd028.zip
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
Diffstat (limited to 'include')
-rw-r--r--include/netfilter.mk2
1 files changed, 1 insertions, 1 deletions
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