[wl-kmod] Add patch for kernel >= 6.12 - RFBZ#7130

commit 16a67f795e2b2efb205aed51c1b060b47b99bd7c Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; Date: Tue Dec 10 20:09:37 2024 +0100 Add patch for kernel >= 6.12 - RFBZ#7130 Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; wl-kmod-028_kernel_6.12_adaptation.patch | 32 ++++++++++++++++++++++++++++++++ wl-kmod.spec | 2 ++ 2 files changed, 34 insertions(+) --- diff --git a/wl-kmod-028_kernel_6.12_adaptation.patch b/wl-kmod-028_kernel_6.12_adaptation.patch new file mode 100644 index 0000000..1064225 --- /dev/null +++ b/wl-kmod-028_kernel_6.12_adaptation.patch @@ -0,0 +1,32 @@ +From 5f6c5c8b27da17c80ce9bd2d6d714295bd352df5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville(a)uphf.fr&gt; +Date: Tue, 10 Dec 2024 09:22:46 +0100 +Subject: [PATCH] wl_linux.c: #include <linux/unaligned.h> for kernel >= 6.12.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; +--- + src/wl/sys/wl_linux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 2000f6f..3c25ce4 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -56,7 +56,11 @@ + #include <asm/irq.h> + #include <asm/pgtable.h> + #include <asm/uaccess.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + + #include <proto/802.1d.h> + +-- +2.47.1 + diff --git a/wl-kmod.spec b/wl-kmod.spec index 04e6b59..f40619e 100644 --- a/wl-kmod.spec +++ b/wl-kmod.spec @@ -51,6 +51,7 @@ Patch23: wl-kmod-024_kernel_6.1_adaptation.patch Patch24: wl-kmod-025_kernel_6.5_adaptation.patch Patch25: wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch Patch26: wl-kmod-027_wpa_supplicant-2.11_add_max_scan_ie_len.patch +Patch27: wl-kmod-028_kernel_6.12_adaptation.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i686 x86_64 @@ -118,6 +119,7 @@ pushd %{name}-%{version}-src %patch -P 24 -p1 -b .kernel_6.5_adaptation %patch -P 25 -p1 -b .kernel_6.10_adaptation %patch -P 26 -p1 -b .wpa_supplicant-2.11_adaptation +%patch -P 27 -p1 -b .kernel_6.12_adaptation # Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec # Actually works for RHEL 6.x and 7.x