[packages/dahdi-linux] - rel 5, fix building with kernel 6.16

[baggins]

commit e1ec7b76cf40657dbf444b6b1fe3b13d1e2bc5b6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 13 01:56:33 2025 +0200

    - rel 5, fix building with kernel 6.16

 dahdi-linux.spec  |  4 +++-
 kernel-6.16.patch | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index f163c1a..10f3adb 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -25,7 +25,7 @@ exit 1
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 
-%define		rel	4
+%define		rel	5
 %define		pname	dahdi-linux
 %define		FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases
 Summary:	DAHDI telephony device support
@@ -49,6 +49,7 @@ Source7:	%{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 # Source7-md5:	a7f3886942bb3e9fed349a41b3390c9f
 Patch0:		kernel-6.11.patch
 Patch1:		kernel-6.15.patch
+Patch2:		kernel-6.16.patch
 Patch3:		no-xpp.patch
 URL:		http://www.asterisk.org/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -149,6 +150,7 @@ cd ../..\
 %setup -q -n %{pname}-%{version}
 %patch -P 0 -p1
 %patch -P 1 -p1
+%patch -P 2 -p1
 %if %{without xpp}
 %patch -P 3 -p1
 %endif
diff --git a/kernel-6.16.patch b/kernel-6.16.patch
new file mode 100644
index 0000000..630d5d4
--- /dev/null
+++ b/kernel-6.16.patch
@@ -0,0 +1,70 @@
+--- dahdi-linux-3.4.0/drivers/dahdi/wcte13xp-base.c~	2025-09-13 01:45:44.000000000 +0200
++++ dahdi-linux-3.4.0/drivers/dahdi/wcte13xp-base.c	2025-09-13 01:49:43.956661576 +0200
+@@ -2393,7 +2393,11 @@
+ 
+ static void te13xp_timer(TIMER_DATA_TYPE timer)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 16, 0)
+ 	struct t13x *wc = from_timer(wc, timer, timer);
++#else
++	struct t13x *wc = timer_container_of(wc, timer, timer);
++#endif
+ 
+ 	if (unlikely(!test_bit(INITIALIZED, &wc->bit_flags)))
+ 		return;
+--- dahdi-linux-3.4.0/drivers/dahdi/wcte43x-base.c~	2025-09-13 01:50:30.000000000 +0200
++++ dahdi-linux-3.4.0/drivers/dahdi/wcte43x-base.c	2025-09-13 01:51:41.859994901 +0200
+@@ -3178,7 +3178,11 @@
+ 
+ static void t43x_timer(TIMER_DATA_TYPE timer)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 16, 0)
+ 	struct t43x *wc = from_timer(wc, timer, timer);
++#else
++	struct t43x *wc = timer_container_of(wc, timer, timer);
++#endif
+ 
+ 	if (!is_initialized(wc))
+ 		return;
+--- dahdi-linux-3.4.0/drivers/dahdi/wcte12xp/base.c~	2025-09-13 01:52:00.000000000 +0200
++++ dahdi-linux-3.4.0/drivers/dahdi/wcte12xp/base.c	2025-09-13 01:53:01.189994894 +0200
+@@ -2784,7 +2784,11 @@
+ static void te12xp_timer(TIMER_DATA_TYPE timer)
+ {
+ 	unsigned long flags;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 16, 0)
+ 	struct t1 *wc = from_timer(wc, timer, timer);
++#else
++	struct t1 *wc = timer_container_of(wc, timer, timer);
++#endif
+ 
+ 	if (unlikely(!test_bit(INITIALIZED, &wc->bit_flags)))
+ 		return;
+--- dahdi-linux-3.4.0/drivers/dahdi/wctc4xxp/base.c~	2025-09-13 01:53:19.000000000 +0200
++++ dahdi-linux-3.4.0/drivers/dahdi/wctc4xxp/base.c	2025-09-13 01:54:30.406661560 +0200
+@@ -3654,7 +3654,11 @@
+ static void
+ wctc4xxp_watchdog(TIMER_DATA_TYPE timer)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 16, 0)
+ 	struct wcdte *wc = from_timer(wc, timer, watchdog);
++#else
++	struct wcdte *wc = timer_container_of(wc, timer, watchdog);
++#endif
+ 	struct tcb *cmd, *temp;
+ 	LIST_HEAD(cmds_to_retry);
+ 	const int MAX_RETRIES = 5;
+--- dahdi-linux-3.4.0/drivers/dahdi/xpp/xbus-pcm.c~	2025-09-13 01:54:49.000000000 +0200
++++ dahdi-linux-3.4.0/drivers/dahdi/xpp/xbus-pcm.c	2025-09-13 01:55:44.136661558 +0200
+@@ -352,7 +352,11 @@
+ 
+ static void xbus_command_timer(TIMER_DATA_TYPE timer)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 16, 0)
+ 	xbus_t *xbus = from_timer(xbus, timer, command_timer);
++#else
++	xbus_t *xbus = timer_container_of(xbus, timer, command_timer);
++#endif
+ 
+ 	BUG_ON(!xbus);
+ 	xbus_command_queue_tick(xbus);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dahdi-linux.git/commitdiff/e1ec7b76cf40657dbf444b6b1fe3b13d1e2bc5b6