Skip to content

Commit 9b33c7b

Browse files
committed
Bump mainline edge kernels to rc7
1 parent 29317c6 commit 9b33c7b

File tree

3 files changed

+52
-2
lines changed

3 files changed

+52
-2
lines changed

config/sources/mainline-kernel.conf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
function mainline_kernel_decide_version__upstream_release_candidate_number() {
99
[[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order
1010
if [[ "${KERNEL_MAJOR_MINOR}" == "6.17" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
11-
declare -g KERNELBRANCH="tag:v6.17-rc1"
11+
declare -g KERNELBRANCH="tag:v6.17-rc5"
1212
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
1313
fi
1414
}

lib/functions/compilation/patch/drivers_network.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ driver_rtl8189ES() {
3838

3939
# Wireless drivers for Realtek 8189ES chipsets
4040

41-
if linux-version compare "${version}" ge 3.14; then
41+
if linux-version compare "${version}" ge 3.14 && linux-version compare "${version}" le 6.16; then
4242

4343
# Attach to specific commit (was "branch:master")
4444
local rtl8189esver='commit:07f03cf721f5e0317012ece4159834327680ba8b' # Commit date: 2025-06-21 (please update when updating commit ref)
@@ -160,6 +160,9 @@ driver_rtl8192EU() {
160160

161161
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-p2p-go-advertising.patch" "applying"
162162

163+
# fix compilation for kernels >= 6.17
164+
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-building-on-6.16-6.17.patch" "applying"
165+
163166
# fix compilation for kernels >= 5.4
164167
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-VFS-import.patch" "applying"
165168

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From 026fb2665d043788ff73e764350376828ba5f322 Mon Sep 17 00:00:00 2001
2+
From: Franz Eitzinger <[email protected]>
3+
Date: Tue, 12 Aug 2025 10:47:22 +0200
4+
Subject: [PATCH 2/2] Fix build with Kernel 6.17: Add support to get radio
5+
index
6+
7+
---
8+
os_dep/linux/ioctl_cfg80211.c | 12 +++++++++++-
9+
1 file changed, 11 insertions(+), 1 deletion(-)
10+
11+
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
12+
index d641305..4ccad87 100644
13+
--- a/drivers/net/wireless/rtl8192eu/os_dep/linux/ioctl_cfg80211.c
14+
+++ b/drivers/net/wireless/rtl8192eu/os_dep/linux/ioctl_cfg80211.c
15+
@@ -3260,7 +3260,11 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
16+
return ret;
17+
}
18+
19+
-static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed)
20+
+static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy,
21+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0))
22+
+ int radio_idx,
23+
+#endif
24+
+ u32 changed)
25+
{
26+
#if 0
27+
struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
28+
@@ -4165,6 +4169,9 @@ static int cfg80211_rtw_set_txpower(struct wiphy *wiphy,
29+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
30+
struct wireless_dev *wdev,
31+
#endif
32+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0))
33+
+ int radio_idx,
34+
+#endif
35+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)) || defined(COMPAT_KERNEL_RELEASE)
36+
enum nl80211_tx_power_setting type, int mbm)
37+
#else
38+
@@ -4205,6 +4212,9 @@ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
39+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
40+
struct wireless_dev *wdev,
41+
#endif
42+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0))
43+
+ int radio_idx,
44+
+#endif
45+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0))
46+
unsigned int link_id,
47+
#endif

0 commit comments

Comments
 (0)