[packages/wl] - rel 24, fix build with linux 6.17
baggins
baggins at pld-linux.org
Sat Oct 4 22:27:11 CEST 2025
commit ca3b511e3afda128a3a4bf4c33a7c36436f1e23b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Oct 5 00:26:49 2025 +0200
- rel 24, fix build with linux 6.17
kernel-6.17.patch | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
wl.spec | 4 ++-
2 files changed, 93 insertions(+), 1 deletion(-)
---
diff --git a/wl.spec b/wl.spec
index 030c2fa..a012b03 100644
--- a/wl.spec
+++ b/wl.spec
@@ -18,7 +18,7 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define rel 23
+%define rel 24
%define pname wl
%define file_ver %(echo %{version} | tr . _)
Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -55,6 +55,7 @@ Patch16: kernel-6.12.patch
Patch17: kernel-6.13.patch
Patch18: kernel-6.14.patch
Patch19: kernel-6.15.patch
+Patch20: kernel-6.17.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}}
@@ -153,6 +154,7 @@ EOF\
%patch -P 17 -p2
%patch -P 18 -p2
%patch -P 19 -p1
+%patch -P 20 -p2
mkdir wl
mv lib src Makefile wl/
diff --git a/kernel-6.17.patch b/kernel-6.17.patch
new file mode 100644
index 0000000..0abf1f4
--- /dev/null
+++ b/kernel-6.17.patch
@@ -0,0 +1,90 @@
+--- wl-6.30.223.271/wl/src/wl/sys/wl_cfg80211_hybrid.c.orig 2025-10-05 00:11:17.000000000 +0200
++++ wl-6.30.223.271/wl/src/wl/sys/wl_cfg80211_hybrid.c 2025-10-05 00:23:40.793330908 +0200
+@@ -74,7 +74,11 @@
+ static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+ struct cfg80211_scan_request *request);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx, u32 changed);
++#else
+ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
++#endif
+ static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_ibss_params *params);
+ static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev);
+@@ -94,9 +98,15 @@
+ static s32 wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code);
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++static s32
++wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, int radio_idx,
++ enum nl80211_tx_power_setting type, s32 dbm);
++#else
+ static s32
+ wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
+ enum nl80211_tx_power_setting type, s32 dbm);
++#endif
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+ static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy,
+ enum nl80211_tx_power_setting type, s32 dbm);
+@@ -106,11 +116,15 @@
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, int radio_idx, unsigned int link_id, s32 *dbm);
++#else
+ #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
++#endif
+ #else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
+ #endif
+@@ -670,7 +684,11 @@
+ return err;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx, u32 changed)
++#else
+ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
++#endif
+ {
+ struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
+ struct net_device *ndev = wl_to_ndev(wl);
+@@ -1105,9 +1123,15 @@
+ }
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++static s32
++wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, int radio_idx,
++ enum nl80211_tx_power_setting type, s32 dbm)
++#else
+ static s32
+ wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
+ enum nl80211_tx_power_setting type, s32 dbm)
++#endif
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+ static s32
+ wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum nl80211_tx_power_setting type, s32 dbm)
+@@ -1166,11 +1190,15 @@
+ }
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, int radio_idx, unsigned int link_id, s32 *dbm)
++#else
+ #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
++#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/ca3b511e3afda128a3a4bf4c33a7c36436f1e23b
More information about the pld-cvs-commit
mailing list