laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42896?usp=email )

Change subject: fix compatibiity with kernel 6.15 + 6.16 regarding timer symbol renaming ......................................................................

fix compatibiity with kernel 6.15 + 6.16 regarding timer symbol renaming

Change-Id: I63d777b948994944337798ee6af9fc656c53bc11 --- M include/dahdi/kernel.h 1 file changed, 10 insertions(+), 0 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/96/42896/1

diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 47d92f5..7a4c088 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1722,4 +1722,14 @@ #define UEVENT_CONST #endif

+/* backwards compatibility layer for old timer API calls used in DAHDI code */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0) +#define del_timer_sync timer_delete_sync +#define del_timer timer_delete +#endif + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0) +#define from_timer timer_container_of +#endif + #endif /* _DAHDI_KERNEL_H */