34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
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)
|