From fa012cc3e1409af37f9b9f4756c63e4d176f46e7 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 12 Mar 2012 02:09:16 +0000
Subject: [PATCH] [backfire] netfilter: fix ipt_ttl and ipt_TTL userspace
 library packaging

SVN-Revision: 30898
---
 include/netfilter.mk                | 6 ++++--
 package/kernel/modules/netfilter.mk | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 13116401f0..12a04e6f42 100644
--- 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 e3e048dd2b..d122e3cbfc 100644
--- 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
 
-- 
2.30.2