From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 11 Dec 2012 09:53:50 +0000 (+0000)
Subject: netfilter.mk: fix packaging of xt_LOG.ko, it moved between 3.3.8 and 3.6.x
X-Git-Tag: v19.07.0-rc1~22666
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=842078340713cabd375409ca4424cb154526ac4c;p=openwrt%2Fstaging%2Fhauke.git

netfilter.mk: fix packaging of xt_LOG.ko, it moved between 3.3.8 and 3.6.x

SVN-Revision: 34625
---

diff --git a/include/netfilter.mk b/include/netfilter.mk
index ef38d50ad8..76dea6f67d 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -37,7 +37,11 @@ $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MAC, $(P_XT)xt_mac))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MULTIPORT, $(P_XT)xt_multiport))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_COMMENT, $(P_XT)xt_comment))
 
-$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG))
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.4.0)),1)
+  $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)xt_LOG))
+else
+  $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG))
+endif
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_TCPMSS, $(P_XT)xt_TCPMSS))
 $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT))