Skip to content

Commit b3912bb

Browse files
amazingfateamazingfate
committed
uefi-arm64: bump to 6.16
1 parent bda9215 commit b3912bb

File tree

7 files changed

+58
-1
lines changed

7 files changed

+58
-1
lines changed

‎config/sources/families/include/uefi_common.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ case "${BRANCH}" in
4141
;;
4242

4343
edge)
44-
declare -g KERNEL_MAJOR_MINOR="6.15"
44+
declare -g KERNEL_MAJOR_MINOR="6.16"
4545
;;
4646
esac
4747

‎lib/functions/compilation/patch/drivers_network.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ driver_rtl8811_rtl8812_rtl8814_rtl8821() {
210210
echo "obj-\$(CONFIG_88XXAU) += rtl8812au/" >> "$kerneldir/drivers/net/wireless/Makefile"
211211
sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8812au\/Kconfig"' \
212212
"$kerneldir/drivers/net/wireless/Kconfig"
213+
214+
# fix compilation for kernels >= 6.16
215+
process_patch_file "${SRC}/patch/misc/wireless-rtl8812au-Fix-6.16.patch" "applying"
213216
fi
214217
}
215218

@@ -291,6 +294,9 @@ driver_rtl8811CU_rtl8821C() {
291294
echo "obj-\$(CONFIG_RTL8821CU) += rtl8811cu/" >> "$kerneldir/drivers/net/wireless/Makefile"
292295
sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8811cu\/Kconfig"' \
293296
"$kerneldir/drivers/net/wireless/Kconfig"
297+
298+
# fix compilation for kernels >= 6.16
299+
process_patch_file "${SRC}/patch/misc/wireless-rtl8811cu-Fix-6.16.patch" "applying"
294300
fi
295301
}
296302

@@ -333,6 +339,9 @@ driver_rtl88x2bu() {
333339
sed -i "/source \"drivers\/net\/wireless\/ti\/Kconfig\"/a source \"drivers\/net\/wireless\/rtl88x2bu\/Kconfig\"" \
334340
"$kerneldir/drivers/net/wireless/Kconfig"
335341

342+
# fix compilation for kernels >= 6.16
343+
process_patch_file "${SRC}/patch/misc/wireless-rtl88x2bu-Fix-6.16.patch" "applying"
344+
336345
fi
337346
}
338347

‎patch/kernel/archive/uefi-arm64-6.15/board-hikey960-usb.patch renamed to ‎patch/kernel/archive/uefi-arm64-6.16/board-hikey960-usb.patch

File renamed without changes.

‎patch/kernel/archive/uefi-arm64-6.15/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch renamed to ‎patch/kernel/archive/uefi-arm64-6.16/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch

File renamed without changes.

‎patch/misc/wireless-rtl8811cu-Fix-6.16.patch

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/cache/sources/linux-kernel-worktree/6.16__arm64__arm64/drivers/net/wireless/rtl8811cu/include/osdep_service_linux.h b/drivers/net/wireless/rtl8811cu/include/osdep_service_linux.h
2+
index ed1e19b..91de46f 100644
3+
--- a/cache/sources/linux-kernel-worktree/6.16__arm64__arm64/drivers/net/wireless/rtl8811cu/include/osdep_service_linux.h
4+
+++ b/drivers/net/wireless/rtl8811cu/include/osdep_service_linux.h
5+
@@ -358,7 +358,11 @@ static inline void timer_hdl(unsigned long cntx)
6+
#endif
7+
{
8+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
9+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0))
10+
+ _timer *ptimer = timer_container_of(ptimer, in_timer, timer);
11+
+#else
12+
_timer *ptimer = from_timer(ptimer, in_timer, timer);
13+
+#endif
14+
#else
15+
_timer *ptimer = (_timer *)cntx;
16+
#endif

‎patch/misc/wireless-rtl8812au-Fix-6.16.patch

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/cache/sources/linux-kernel-worktree/6.16__arm64__arm64/drivers/net/wireless/rtl8812au/include/osdep_service_linux.h b/drivers/net/wireless/rtl8812au/include/osdep_service_linux.h
2+
index 4c276f6..aeb8000 100644
3+
--- a/drivers/net/wireless/rtl8812au/include/osdep_service_linux.h
4+
+++ b/drivers/net/wireless/rtl8812au/include/osdep_service_linux.h
5+
@@ -356,7 +356,11 @@ static inline void timer_hdl(unsigned long cntx)
6+
#endif
7+
{
8+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
9+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0))
10+
+ _timer *ptimer = timer_container_of(ptimer, in_timer, timer);
11+
+#else
12+
_timer *ptimer = from_timer(ptimer, in_timer, timer);
13+
+#endif
14+
#else
15+
_timer *ptimer = (_timer *)cntx;
16+
#endif

‎patch/misc/wireless-rtl88x2bu-Fix-6.16.patch

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/cache/sources/linux-kernel-worktree/6.16__arm64__arm64/drivers/net/wireless/rtl88x2bu/include/osdep_service_linux.h b/drivers/net/wireless/rtl88x2bu/include/osdep_service_linux.h
2+
index 46b9528..fb32ed6 100644
3+
--- a/drivers/net/wireless/rtl88x2bu/include/osdep_service_linux.h
4+
+++ b/drivers/net/wireless/rtl88x2bu/include/osdep_service_linux.h
5+
@@ -358,7 +358,11 @@ static inline void timer_hdl(unsigned long cntx)
6+
#endif
7+
{
8+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
9+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0))
10+
+ _timer *ptimer = timer_container_of(ptimer, in_timer, timer);
11+
+#else
12+
_timer *ptimer = from_timer(ptimer, in_timer, timer);
13+
+#endif
14+
#else
15+
_timer *ptimer = (_timer *)cntx;
16+
#endif

0 commit comments

Comments
 (0)