[netfilter] fix ipt_ttl and ipt_TTL userspace library packaging
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 12 Mar 2012 02:07:22 +0000 (02:07 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 12 Mar 2012 02:07:22 +0000 (02:07 +0000)
SVN-Revision: 30897

include/netfilter.mk
package/kernel/modules/netfilter.mk

index 1cbb9a8b86b3e084b7624769d8f2a8b55995d1b5..1a044edb1537f51b6972bce1b17f80fa9616ba01 100644 (file)
@@ -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))
 
index 5142f6c1293fe76978a0404e0bc8d0117446e300..1d3c771925d7b1aeda9e251f9ffca626ac6a8c36 100644 (file)
@@ -122,6 +122,7 @@ define KernelPackage/ipt-ipopt/description
  - statistic
  - tcpmss
  - time
+ - ttl/TTL
  - unclean
 endef