Skip to content

Fix: add from_timer() helper for kernel >=6.14 (tested on 6.16) #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyb3rch3f wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: add from_timer() helper for kernel >=6.14 (tested on 6.16) #258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions include/osdep_service_linux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,16 @@ static inline void timer_hdl(struct timer_list *in_timer)
static inline void timer_hdl(unsigned long cntx)
#endif
{
#include <linux/version.h>
#include <linux/timer.h>

/* --- Fix for kernel >=6.14: missing from_timer() helper --- */
#ifndef from_timer
#define from_timer(var, callback_timer, fieldname) \
({ typeof(var) __tmp = (var); \
(_timer *)((char *)(callback_timer) - offsetof(_timer, fieldname)); })
#endif
/* --- end patch --- */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
_timer *ptimer = from_timer(ptimer, in_timer, timer);
#else
Expand Down