summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-12 02:07:22 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-12 02:07:22 +0000
commita33e79fbcb9b157574de4baaea87b5870e29d798 (patch)
treead461d3262b7aa0eac8ffb47292eaa4f7df5dd1c
parentd4b1ee15d13e5bd58482f1bc2429d87a133e5ca9 (diff)
[netfilter] fix ipt_ttl and ipt_TTL userspace library packaging
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30897 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/netfilter.mk8
-rw-r--r--package/kernel/modules/netfilter.mk1
2 files changed, 5 insertions, 4 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk
index 1cbb9a8b8..1a044edb1 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -150,11 +150,11 @@ else
endif
# userland only
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_tos)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_TOS)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, xt_tos)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, xt_TOS)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, ipt_ttl)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, ipt_TTL)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_TTL, ipt_ttl)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_TTL, ipt_TTL)))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_HL, $(P_XT)xt_hl))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, $(P_XT)xt_HL))
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 5142f6c12..1d3c77192 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -122,6 +122,7 @@ define KernelPackage/ipt-ipopt/description
- statistic
- tcpmss
- time
+ - ttl/TTL
- unclean
endef