From da4b2cd01b4002c81d180dc7a8d482294e412c17 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 20 Jan 2026 09:19:33 +0100
Subject: [PATCH] Revert "LinuxKPI: rename from_timer() to
 timer_container_of()"

This reverts commit 336be73ac1e6b26b9163460f0e88432508eb8394.

This breaks building rtw88.
---
 sys/compat/linuxkpi/common/include/linux/timer.h | 5 -----
 sys/compat/linuxkpi/common/src/linux_80211.c     | 2 +-
 sys/dev/irdma/irdma_cm.c                         | 2 +-
 sys/dev/irdma/irdma_utils.c                      | 4 ++--
 sys/dev/qat/qat_common/adf_gen4_timer.c          | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h
index 9ab30f3003a..c69274a2946 100644
--- a/sys/compat/linuxkpi/common/include/linux/timer.h
+++ b/sys/compat/linuxkpi/common/include/linux/timer.h
@@ -49,13 +49,8 @@ extern unsigned long linux_timer_hz_mask;
 
 #define	TIMER_IRQSAFE	0x0001
 
-#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION < 61600)
 #define	from_timer(var, arg, field)					\
         container_of(arg, typeof(*(var)), field)
-#else
-#define	timer_container_of(var, arg, field)				\
-    container_of(arg, typeof(*(var)), field)
-#endif
 
 #define	timer_setup(timer, func, flags) do {				\
 	CTASSERT(((flags) & ~TIMER_IRQSAFE) == 0);			\
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
index cd7898ab16c..f4b67d012d9 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -7417,7 +7417,7 @@ lkpi_wiphy_delayed_work_timer(struct timer_list *tl)
 {
 	struct wiphy_delayed_work *wdwk;
 
-	wdwk = timer_container_of(wdwk, tl, timer);
+	wdwk = from_timer(wdwk, tl, timer);
 	wiphy_work_queue(wdwk->wiphy, &wdwk->work);
 }
 
diff --git a/sys/dev/irdma/irdma_cm.c b/sys/dev/irdma/irdma_cm.c
index 69323336442..07f84040c44 100644
--- a/sys/dev/irdma/irdma_cm.c
+++ b/sys/dev/irdma/irdma_cm.c
@@ -1316,7 +1316,7 @@ irdma_cm_timer_tick(struct timer_list *t)
 	struct irdma_timer_entry *send_entry, *close_entry;
 	struct list_head *list_core_temp;
 	struct list_head *list_node;
-	struct irdma_cm_core *cm_core = timer_container_of(cm_core, t, tcp_timer);
+	struct irdma_cm_core *cm_core = from_timer(cm_core, t, tcp_timer);
 	struct irdma_sc_vsi *vsi;
 	u32 settimer = 0;
 	unsigned long timetosend;
diff --git a/sys/dev/irdma/irdma_utils.c b/sys/dev/irdma/irdma_utils.c
index 038f1980082..5fc37022981 100644
--- a/sys/dev/irdma/irdma_utils.c
+++ b/sys/dev/irdma/irdma_utils.c
@@ -876,7 +876,7 @@ irdma_terminate_done(struct irdma_sc_qp *qp, int timeout_occurred)
 static void
 irdma_terminate_timeout(struct timer_list *t)
 {
-	struct irdma_qp *iwqp = timer_container_of(iwqp, t, terminate_timer);
+	struct irdma_qp *iwqp = from_timer(iwqp, t, terminate_timer);
 	struct irdma_sc_qp *qp = &iwqp->sc_qp;
 
 	irdma_terminate_done(qp, 1);
@@ -1528,7 +1528,7 @@ static void
 irdma_hw_stats_timeout(struct timer_list *t)
 {
 	struct irdma_vsi_pestat *pf_devstat =
-	timer_container_of(pf_devstat, t, stats_timer);
+	from_timer(pf_devstat, t, stats_timer);
 	struct irdma_sc_vsi *sc_vsi = pf_devstat->vsi;
 
 	if (sc_vsi->dev->hw_attrs.uk_attrs.hw_rev >= IRDMA_GEN_2)
diff --git a/sys/dev/qat/qat_common/adf_gen4_timer.c b/sys/dev/qat/qat_common/adf_gen4_timer.c
index 2c74d09418e..96b65cdff18 100644
--- a/sys/dev/qat/qat_common/adf_gen4_timer.c
+++ b/sys/dev/qat/qat_common/adf_gen4_timer.c
@@ -57,7 +57,7 @@ end:
 static void
 timer_handler(struct timer_list *tl)
 {
-	struct adf_int_timer *int_timer = timer_container_of(int_timer, tl, timer);
+	struct adf_int_timer *int_timer = from_timer(int_timer, tl, timer);
 	struct adf_accel_dev *accel_dev = int_timer->accel_dev;
 	struct adf_hb_timer_data *hb_timer_data = NULL;
 	u64 timeout_val = adf_get_next_timeout(int_timer->timeout_val);