[wl-kmod] Add patch for kernel >= 6.0

commit d6acdf7711f0d121ffe2ac18b10034eb65c5e4f9 Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; Date: Sun Oct 16 20:01:53 2022 +0200 Add patch for kernel >= 6.0 wl-kmod-023_kernel_6.0_adaptation.patch | 15 +++++++++++++++ wl-kmod.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) --- diff --git a/wl-kmod-023_kernel_6.0_adaptation.patch b/wl-kmod-023_kernel_6.0_adaptation.patch new file mode 100644 index 0000000..9ff534c --- /dev/null +++ b/wl-kmod-023_kernel_6.0_adaptation.patch @@ -0,0 +1,15 @@ +diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c +--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2022-04-02 19:58:24.236715000 +0200 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2022-10-16 16:20:30.529848770 +0200 +@@ -2532,7 +2532,11 @@ + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) + roam_info.channel = &wl->conf->channel; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) ++ roam_info.links[0].bssid = (u8*)&wl->bssid; ++#else + roam_info.bssid = (u8*)&wl->bssid; ++#endif + roam_info.req_ie = conn_info->req_ie; + roam_info.req_ie_len = conn_info->req_ie_len; + roam_info.resp_ie = conn_info->resp_ie; diff --git a/wl-kmod.spec b/wl-kmod.spec index 901c336..d101806 100644 --- a/wl-kmod.spec +++ b/wl-kmod.spec @@ -10,7 +10,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -40,6 +40,7 @@ Patch18: wl-kmod-019_kernel_5.9_segment_eq_removed.patch Patch19: wl-kmod-020_kernel_5.10_get_set_fs_removed.patch Patch20: wl-kmod-021_kernel_5.17_adaptation.patch Patch21: wl-kmod-022_kernel_5.18_adaptation.patch +Patch22: wl-kmod-023_kernel_6.0_adaptation.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i686 x86_64 @@ -102,6 +103,7 @@ pushd %{name}-%{version}-src %patch19 -p1 -b .kernel_5.10_get_set_fs_removed %patch20 -p1 -b .kernel_5.17_adaptation %patch21 -p1 -b .kernel_5.18_adaptation +%patch22 -p1 -b .kernel_6.0_adaptation # Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec # Actually works for RHEL 6.x and 7.x @@ -343,6 +345,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || : rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 16 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; - 6.30.223.271-44 +- Add patch for kernel >= 6.0 + * Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 6.30.223.271-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1