From 643a9946465aa39ac69b7fc885a8a696eef345f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20G=C3=B6rner?= <5477952+MaxG87@users.noreply.github.com> Date: Tue, 10 Jun 2025 10:17:39 +0200 Subject: [PATCH] Rename from_timer to timer_container_of Linux commit 41cb08555c4164996d67c78b3bf1c658075b75f1 introduced that renaming. Thus, we have to follow along. --- 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 154e971..daa8bb6 100644 --- a/include/osdep_service_linux.h +++ b/include/osdep_service_linux.h @@ -353,7 +353,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;