[packages/wl] - rel 22, fix building for kernel 6.14

baggins baggins at pld-linux.org
Sat Apr 19 02:08:10 CEST 2025


commit 1cbb25879091dcca2d8c876692259c090c2524d1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 19 02:14:29 2025 +0200

    - rel 22, fix building for kernel 6.14

 kernel-6.14.patch | 26 ++++++++++++++++++++++++++
 wl.spec           |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/wl.spec b/wl.spec
index 3245252..df4a9c9 100644
--- a/wl.spec
+++ b/wl.spec
@@ -18,7 +18,7 @@ exit 1
 
 %define		_duplicate_files_terminate_build	0
 
-%define		rel	21
+%define		rel	22
 %define		pname	wl
 %define		file_ver	%(echo %{version} | tr . _)
 Summary:	Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -53,6 +53,7 @@ Patch14:	kernel-6.0.patch
 Patch15:	kernel-6.1.patch
 Patch16:	kernel-6.12.patch
 Patch17:	kernel-6.13.patch
+Patch18:	kernel-6.14.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}}
@@ -149,6 +150,7 @@ EOF\
 %patch -P 15 -p2
 %patch -P 16 -p2
 %patch -P 17 -p2
+%patch -P 18 -p2
 
 mkdir wl
 mv lib src Makefile wl/
diff --git a/kernel-6.14.patch b/kernel-6.14.patch
new file mode 100644
index 0000000..4df7d1f
--- /dev/null
+++ b/kernel-6.14.patch
@@ -0,0 +1,26 @@
+--- wl-6.30.223.271/wl/src/wl/sys/wl_cfg80211_hybrid.c~	2025-04-19 02:09:52.000000000 +0200
++++ wl-6.30.223.271/wl/src/wl/sys/wl_cfg80211_hybrid.c	2025-04-19 02:11:50.179999579 +0200
+@@ -106,7 +106,11 @@
+ #endif
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, unsigned int link_id, s32 *dbm);
++#else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm);
++#endif
+ #else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
+ #endif
+@@ -1162,7 +1166,11 @@
+ }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, unsigned int link_id, s32 *dbm)
++#else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm)
++#endif
+ #else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm)
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/1cbb25879091dcca2d8c876692259c090c2524d1



More information about the pld-cvs-commit mailing list