Skip to content

Commit 5df613d

Browse files
authored
Merge pull request #366 from zer0def/master
timer bringup for 6.16
2 parents 66c015a + 20ec77a commit 5df613d

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

include/osdep_service_linux.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,9 @@ static inline void timer_hdl(struct timer_list *in_timer)
351351
static inline void timer_hdl(unsigned long cntx)
352352
#endif
353353
{
354-
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
354+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0))
355+
_timer *ptimer = timer_container_of(ptimer, in_timer, timer);
356+
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
355357
_timer *ptimer = from_timer(ptimer, in_timer, timer);
356358
#else
357359
_timer *ptimer = (_timer *)cntx;

0 commit comments

Comments
 (0)