upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "LinuxKPI: rename from_timer() to timer_container_of()"

Browse source 
This reverts commit 336be73ac1.

This breaks building rtw88.
This commit is contained in:
Franco Fichtner 2026-01-20 09:19:33 +01:00
parent 75c41156a5
commit da4b2cd01b
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/compat/linuxkpi/common/include/linux/timer.h
View file

@ -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); \

2
sys/compat/linuxkpi/common/src/linux_80211.c
View file

@ -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);
}

2
sys/dev/irdma/irdma_cm.c
View file

@ -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;

4
sys/dev/irdma/irdma_utils.c
View file

@ -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)

2
sys/dev/qat/qat_common/adf_gen4_timer.c
View file

@ -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);