From a0ea38760274f643570792e15cff52807c548ee3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 21 Jun 2025 08:22:29 +0000 Subject: [PATCH] fix build for kernel 6.16.y The from_timer macro was renamed in v6.16-rc1 commit 41cb08555c416 ("treewide, timers: Rename from_timer() to timer_container_of()"). Signed-off-by: Christian Hewitt --- include/osdep_service_linux.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h index a402b33..e5f7b17 100644 --- a/include/osdep_service_linux.h +++ b/include/osdep_service_linux.h @@ -370,7 +370,11 @@ static inline void timer_hdl(unsigned long cntx) #endif { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)) + _timer *ptimer = timer_container_of(ptimer, in_timer, timer); +#else _timer *ptimer = from_timer(ptimer, in_timer, timer); +#endif #else _timer *ptimer = (_timer *)cntx; #endif