From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 19 Nov 2024 19:38:43 +0000 (+0100)
Subject: build: support for Linux 6.12
X-Git-Tag: v3.27~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b1dca49026c6e7bfcf871eb6adc480eac9e53e5;p=thirdparty%2Fxtables-addons.git

build: support for Linux 6.12
---

diff --git a/configure.ac b/configure.ac
index b33057e..06d7d74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AS_IF([test -n "$kbuilddir"], [
 		yoff
 	], [
 		echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-		if test "$kmajor" -gt 6 -o "$kmajor" -eq 6 -a "$kminor" -gt 9; then
+		if test "$kmajor" -gt 6 -o "$kmajor" -eq 6 -a "$kminor" -gt 12; then
 			yon
 			echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
 			yoff
diff --git a/extensions/xt_ipp2p.c b/extensions/xt_ipp2p.c
index 0eb3190..594dad1 100644
--- a/extensions/xt_ipp2p.c
+++ b/extensions/xt_ipp2p.c
@@ -6,7 +6,11 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <net/tcp.h>
 #include <net/udp.h>
-#include <asm/unaligned.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+#	include <linux/unaligned.h>
+#else
+#	include <asm/unaligned.h>
+#endif
 #include "xt_ipp2p.h"
 #include "compat_xtables.h"
 #if !defined(CONFIG_TEXTSEARCH_BM) && !defined(CONFIG_TEXTSEARCH_BM_MODULE)