[backfire] netfilter: fix ipt_ttl and ipt_TTL userspace library packaging

SVN-Revision: 30898

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 13116401f0942f58771e734fe62a2c8a84c1b1a7..12a04e6f424ae71bfa69f6d94be461ab83573799 100644 (file)
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -145,8 +145,10 @@ else
 endif
 
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
-  $(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))
+  $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_HL, $(P_XT)xt_hl)))
+  $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, $(P_XT)xt_HL)))
+  $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_HL, $(P_XT)xt_ttl)))
+  $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, $(P_XT)xt_TTL)))
 else
   $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_TTL, $(P_V4)ipt_ttl))
   $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_TTL, $(P_V4)ipt_TTL))

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index e3e048dd2b2cf1541d531ec89e384acf1f6bcb1f..d122e3cbfcb02c96d32beae81b2675886e6a4cc3 100644 (file)
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -120,7 +120,7 @@ define KernelPackage/ipt-ipopt/description
  - tcpmss
  - time
  - tos/TOS (prior to 2.6.25)
- - ttl/TTL (prior to 2.6.30)
+ - ttl/TTL
  - unclean
 endef