From 77a82dbac7192bb49fa87458561b0f2455cdc88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rin=20Cat=20=28=E9=88=B4=E7=8C=AB=29?= Date: Wed, 11 Jun 2025 03:20:47 -0400 Subject: [PATCH] Linux 6.16 compat: more timers name change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rin Cat (鈴猫) --- include/osdep_service_linux.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h index ed1e19b..f3ede79 100644 --- a/include/osdep_service_linux.h +++ b/include/osdep_service_linux.h @@ -357,7 +357,9 @@ static inline void timer_hdl(struct timer_list *in_timer) 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); +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) _timer *ptimer = from_timer(ptimer, in_timer, timer); #else _timer *ptimer = (_timer *)cntx;