commit e346bc1aae19ad711be50839909a63230515d5e8
Author: Jan Rękorajski <[email protected]>
Date: Fri Oct 28 22:52:39 2022 +0200
- fix building with kernel 6.0, rel 18
kernel-6.0.patch | 14 ++++++++++++++
wl.spec | 4 +++-
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/wl.spec b/wl.spec
index 3ae8d8d..3feac88 100644
--- a/wl.spec
+++ b/wl.spec
@@ -18,7 +18,7 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define rel 17
+%define rel 18
%define pname wl
%define file_ver %(echo %{version} | tr . _)
Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -49,6 +49,7 @@ Patch10: linux-5.6.patch
Patch11: kernel-5.10.patch
Patch12: kernel-5.17.patch
Patch13: kernel-5.18.patch
+Patch14: kernel-6.0.patch
URL: http://www.broadcom.com/support/802.11
BuildRequires: rpmbuild(macros) >= 1.701
%{?with_kernel:%{expand:%buildrequires_kernel
kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -141,6 +142,7 @@ EOF\
%patch11 -p1
%patch12 -p2
%patch13 -p2
+%patch14 -p2
mkdir wl
mv lib src Makefile wl/
diff --git a/kernel-6.0.patch b/kernel-6.0.patch
new file mode 100644
index 0000000..fc733e3
--- /dev/null
+++ b/kernel-6.0.patch
@@ -0,0 +1,14 @@
+--- wl-6.30.223.271/wl/src/wl/sys/wl_cfg80211_hybrid.c~ 2022-10-28
22:34:15.000000000 +0200
++++ wl-6.30.223.271/wl/src/wl/sys/wl_cfg80211_hybrid.c 2022-10-28
22:50:49.322077055 +0200
+@@ -2388,7 +2388,11 @@
+ bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
+ ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+ struct cfg80211_roam_info roam_info = {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
++ .links[0].bss = bss,
++#else
+ .bss = bss,
++#endif
+ .req_ie = conn_info->req_ie,
+ .req_ie_len = conn_info->req_ie_len,
+ .resp_ie = conn_info->resp_ie,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/e346bc1aae19ad711be50839909a63230515d5e8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
