diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-12-11 09:53:50 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-12-11 09:53:50 +0000 |
| commit | 491ecb8358779255c4df6423d7e152ca53a7c7de (patch) | |
| tree | 88145d65a2fc52d5cfaba7aec21f894450a12cdc /include | |
| parent | 515fa69f8f0357afe9159a718ff254cf936c754e (diff) | |
| download | upstream-491ecb8358779255c4df6423d7e152ca53a7c7de.tar.gz upstream-491ecb8358779255c4df6423d7e152ca53a7c7de.tar.bz2 upstream-491ecb8358779255c4df6423d7e152ca53a7c7de.zip | |
netfilter.mk: fix packaging of xt_LOG.ko, it moved between 3.3.8 and 3.6.x
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34625 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/netfilter.mk | 8 |
1 files changed, 6 insertions, 2 deletions
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)) |