aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-18 20:39:07 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-18 20:39:07 +0000
commitc32a125607688264293d2eda27a580009a815696 (patch)
tree1caa0ab0be517f2d5cc3472559b110ff5fbdc55f
parent20d28f7685c4dec7ea813e16fabc207230ab26cd (diff)
downloadupstream-c32a125607688264293d2eda27a580009a815696.tar.gz
upstream-c32a125607688264293d2eda27a580009a815696.tar.bz2
upstream-c32a125607688264293d2eda27a580009a815696.zip
netfilter: workaround a userspace/kernel mismatch on Linux 2.6.35 and later
SVN-Revision: 23521
-rw-r--r--include/netfilter.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk
index 5ec7df6bf5..35f46de86e 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