]> git.ipfire.org Git - thirdparty/xtables-addons.git/commitdiff
build: support for Linux 6.12
authorJan Engelhardt <jengelh@inai.de>
Tue, 19 Nov 2024 19:38:43 +0000 (20:38 +0100)
committerJan Engelhardt <jengelh@inai.de>
Tue, 19 Nov 2024 19:39:00 +0000 (20:39 +0100)
configure.ac
extensions/xt_ipp2p.c

index b33057edaea436837b906144848f551f1bf59c8d..06d7d743d762791219880f9830ad8afa449997f3 100644 (file)
@@ -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
index 0eb31903d31a63adff41798831dbde87291155d9..594dad116ea97a21691dd99792394280dd5e8b74 100644 (file)
@@ -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)