From a7fbf4f4de1ac55e7b82eab8e5497dab0e2daad5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 16 Oct 2012 00:27:28 +0200
Subject: [PATCH] build: remove support for Linux 2.6.25

---
 doc/changelog.txt           | 2 +-
 extensions/compat_xtables.h | 4 ++--
 extensions/xt_TEE.c         | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 547bddd..9a5f6d2 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17--2.6.24
+- remove support for Linux 2.6.17--2.6.25
 
 
 v1.47.1 (2010-10-15)
diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 676a6c8..78bdd67 100644
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -8,8 +8,8 @@
 
 #define DEBUGP Use__pr_debug__instead
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
-#	warning Kernels below 2.6.25 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+#	warning Kernels below 2.6.26 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
diff --git a/extensions/xt_TEE.c b/extensions/xt_TEE.c
index 636bf7c..1b62589 100644
--- a/extensions/xt_TEE.c
+++ b/extensions/xt_TEE.c
@@ -193,11 +193,7 @@ tee_tg_route6(struct sk_buff *skb, const struct xt_tee_tginfo *info)
 	fl.nl_u.ip6_u.flowlabel = ((iph->flow_lbl[0] & 0xF) << 16) |
 		(iph->flow_lbl[1] << 8) | iph->flow_lbl[2];
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 25)
-	dst = ip6_route_output(NULL, &fl);
-#else
 	dst = ip6_route_output(dev_net(skb->dev), NULL, &fl);
-#endif
 	if (dst == NULL)
 		return false;