[wl-kmod] Fix patch for kernel >= 6.0
commit 52de5250c7c2a9daaa6334ab5bf262a133ea5929
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Mon Oct 17 01:22:35 2022 +0200
Fix patch for kernel >= 6.0
wl-kmod-023_kernel_6.0_adaptation.patch | 8 +++++---
wl-kmod.spec | 5 ++++-
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/wl-kmod-023_kernel_6.0_adaptation.patch
b/wl-kmod-023_kernel_6.0_adaptation.patch
index 9ff534c..aa1ca18 100644
--- a/wl-kmod-023_kernel_6.0_adaptation.patch
+++ b/wl-kmod-023_kernel_6.0_adaptation.patch
@@ -1,13 +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 @@
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2022-10-17
01:08:31.537677649 +0200
+@@ -2531,8 +2531,13 @@
+ return err;
#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].channel = &wl->conf->channel;
+ roam_info.links[0].bssid = (u8*)&wl->bssid;
+#else
+ roam_info.channel = &wl->conf->channel;
roam_info.bssid = (u8*)&wl->bssid;
+#endif
roam_info.req_ie = conn_info->req_ie;
diff --git a/wl-kmod.spec b/wl-kmod.spec
index f6fe6a3..a60c07f 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 44%{?dist}
+Release: 45%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -346,6 +346,9 @@ chmod 0755
$RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 17 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-45
+- Fix patch for kernel >= 6.0
+
* Sun Oct 16 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-44
- Add patch for kernel >= 6.0
- Fix SPEC file for RHEL 9.x