aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/broadcom-wl/broadcom-wl.SlackBuild1
-rw-r--r--network/broadcom-wl/patches/019-linux614.patch34
2 files changed, 35 insertions, 0 deletions
diff --git a/network/broadcom-wl/broadcom-wl.SlackBuild b/network/broadcom-wl/broadcom-wl.SlackBuild
index d48a73026a..ecb5b83e49 100644
--- a/network/broadcom-wl/broadcom-wl.SlackBuild
+++ b/network/broadcom-wl/broadcom-wl.SlackBuild
@@ -103,6 +103,7 @@ patch -p1 < $CWD/patches/015-linux600.patch || exit 1
patch -p1 < $CWD/patches/016-linux601.patch || exit 1
patch -p1 < $CWD/patches/017-linux612.patch || exit 1
patch -p1 < $CWD/patches/018-linux613.patch || exit 1
+patch -p1 < $CWD/patches/019-linux614.patch || exit 1
# See https://lkml.org/lkml/2019/3/1/643
sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_iw.c
diff --git a/network/broadcom-wl/patches/019-linux614.patch b/network/broadcom-wl/patches/019-linux614.patch
new file mode 100644
index 0000000000..1ba8de1b85
--- /dev/null
+++ b/network/broadcom-wl/patches/019-linux614.patch
@@ -0,0 +1,34 @@
+From: Eduard Bloch <blade@debian.org>
+Date: Sun, 16 Mar 2025 16:13:08 +0100
+Subject: Prepare for 6.14.0-rc6
+
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index 2c865c1..e23ef83 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -98,7 +98,9 @@ static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy,
+ enum tx_power_setting type, s32 mbm);
+ #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, u32 /*link_id*/, s32 *dbm);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm);
+ #else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm);
+@@ -1159,7 +1161,9 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type, s32 mb
+ return err;
+ }
+
+-#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, u32 /*link_id*/, s32 *dbm)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm)
+ #else
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm)