From: Jan Engelhardt <jengelh@medozas.de>
Date: Sat, 24 Sep 2011 21:18:33 +0000 (+0200)
Subject: xt_ECHO: fix kernel warning about RTAX_HOPLIMIT being used
X-Git-Tag: v1.40~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30d227135b84797d813a8998269615a3a4b77348;p=thirdparty%2Fxtables-addons.git

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

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 655e547..367e8f2 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,8 @@
 
 HEAD
 ====
+Fixes:
+- xt_ECHO: fix kernel warning about RTAX_HOPLIMIT being used
 
 
 v1.39 (2011-09-21)
diff --git a/extensions/xt_ECHO.c b/extensions/xt_ECHO.c
index 5dbfbe7..389be12 100644
--- a/extensions/xt_ECHO.c
+++ b/extensions/xt_ECHO.c
@@ -18,6 +18,7 @@
 #	include <linux/netfilter_bridge.h>
 #endif
 #include <net/ip.h>
+#include <net/route.h>
 #include "compat_xtables.h"
 
 static unsigned int
@@ -82,7 +83,11 @@ echo_tg4(struct sk_buff **poldskb, const struct xt_action_param *par)
 	if (ip_route_me_harder(&newskb, RTN_UNSPEC) != 0)
 		goto free_nskb;
 
-	newip->ttl        = dst_metric(skb_dst(newskb), RTAX_HOPLIMIT);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+	newip->ttl = ip4_dst_hoplimit(skb_dst(newskb));
+#else
+	newip->ttl = dst_metric(skb_dst(newskb), RTAX_HOPLIMIT);
+#endif
 	newskb->ip_summed = CHECKSUM_NONE;
 
 	/* "Never happens" (?) */