From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Oct 2010 20:39:07 +0000 (+0000)
Subject: netfilter: workaround a userspace/kernel mismatch on Linux 2.6.35 and later
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c32a125607688264293d2eda27a580009a815696;p=openwrt%2Fstaging%2Frmilecki.git

netfilter: workaround a userspace/kernel mismatch on Linux 2.6.35 and later

SVN-Revision: 23521
---

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 5ec7df6bf50..35f46de86e6 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -135,8 +135,13 @@ $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_CLASSIFY, $(P_XT)xt_CL
 $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_DSCP, $(P_V4)ipt_dscp))
 $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_ECN, $(P_V4)ipt_ECN))
 $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_MARK, $(P_V4)ipt_MARK))
+
+# XXX: 2.6.35+ has xt_MARK.ko merged into xt_mark.ko, userspace is still separate
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1)
-  $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_mark))
+  # kernel: xt_mark.ko
+  $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_mark)))
+  # userland: xt_MARK.so
+  $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_MARK)))
 else
   $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_MARK))
 endif