From: Jo-Philipp Wich Date: Sun, 19 Dec 2010 16:47:30 +0000 (+0000) Subject: netfilter.mk: fix connmark packaging for Kernels >= 2.6.35, thanks Daniel Gimpelevich X-Git-Tag: reboot~18007 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d2d990e41e2d6a5b367fdc18d0ff1c7e987ed208;p=openwrt%2Fstaging%2Fxback.git netfilter.mk: fix connmark packaging for Kernels >= 2.6.35, thanks Daniel Gimpelevich SVN-Revision: 24729 --- diff --git a/include/netfilter.mk b/include/netfilter.mk index 35f46de86e..3f892bb2ec 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -77,7 +77,8 @@ $(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_RECENT, $(P_X $(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_IP_NF_TARGET_CONNMARK, $(P_V4)ipt_CONNMARK)) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) - $(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_TARGET_CONNMARK, $(P_XT)xt_connmark)) + $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_TARGET_CONNMARK, $(P_XT)xt_connmark))) + $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_TARGET_CONNMARK, $(P_XT)xt_CONNMARK))) else $(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_TARGET_CONNMARK, $(P_XT)xt_CONNMARK)) endif