xt_TARPIT: fix kernel warning about RTAX_HOPLIMIT being used

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 5379be91493bd211f7b3beec04c24baa19e3be75..dfab91a7a836b06a246a302c6722dafc425c3e47 100644 (file)
--- 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 880e5aa51b94a407860661c47ae213f0dae5c12b..c2bf3fb43127b101aba29951b0c4ee325d5ba73a 100644 (file)
--- 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;