From: Jan Engelhardt <jengelh@medozas.de>
Date: Mon, 25 Jul 2011 23:57:45 +0000 (+0200)
Subject: xt_TARPIT: fix kernel warning about RTAX_HOPLIMIT being used
X-Git-Tag: v1.38~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd18e2479cc14922a7bf3a1c6c4e8ea890b84a86;p=thirdparty%2Fxtables-addons.git

xt_TARPIT: fix kernel warning about RTAX_HOPLIMIT being used
---

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 5379be9..dfab91a 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,7 @@
 
 HEAD
 ====
+- xt_TARPIT: fix kernel warning about RTAX_HOPLIMIT being used
 
 
 v1.37 (2011-06-25)
diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index 880e5aa..c2bf3fb 100644
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -232,7 +232,11 @@ static void tarpit_tcp(struct sk_buff *oldskb, unsigned int hook,
 	if (mode == XTTARPIT_HONEYPOT)
 		niph->ttl = 128;
 	else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+		niph->ttl = ip4_dst_hoplimit(skb_dst(nskb));
+#else
 		niph->ttl = dst_metric(skb_dst(nskb), RTAX_HOPLIMIT);
+#endif
 
 	/* Adjust IP checksum */
 	niph->check = 0;