diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-19 16:47:30 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-19 16:47:30 +0000 |
| commit | d2d990e41e2d6a5b367fdc18d0ff1c7e987ed208 (patch) | |
| tree | bb75bf69926dd2d47882b7180ac87c82a40b7c25 | |
| parent | 4869f2c5e87e187af41509a2b43c768121149829 (diff) | |
| download | upstream-d2d990e41e2d6a5b367fdc18d0ff1c7e987ed208.tar.gz upstream-d2d990e41e2d6a5b367fdc18d0ff1c7e987ed208.tar.bz2 upstream-d2d990e41e2d6a5b367fdc18d0ff1c7e987ed208.zip | |
netfilter.mk: fix connmark packaging for Kernels >= 2.6.35, thanks Daniel Gimpelevich
SVN-Revision: 24729
| -rw-r--r-- | include/netfilter.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 |