From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: builder Date: Sun, 10 May 2026 00:00:00 +0000 Subject: [PATCH] auto_bridge: adapt timer API names for Linux 6.18 Linux 6.18 uses the renamed timer helpers. Update the vendor module to use timer_delete() and timer_container_of(). --- auto_bridge/auto_bridge.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/auto_bridge/auto_bridge.c +++ b/auto_bridge/auto_bridge.c @@ -243,7 +243,7 @@ list_add(&table_entry->list_msg_to_send, &l2flow_list_msg_to_send); work_to_do = 1; } - if (del_timer(&table_entry->timeout) || no_timer) + if (timer_delete(&table_entry->timeout) || no_timer) __abm_go_dying(table_entry); } } @@ -604,7 +604,7 @@ ****************************************************************************/ static void abm_death_by_timeout(struct timer_list *t) { - struct l2flowTable *table_entry = from_timer(table_entry, t, timeout); + struct l2flowTable *table_entry = timer_container_of(table_entry, t, timeout); spin_lock_bh(&abm_lock); __abm_go_dying(table_entry); @@ -671,7 +671,7 @@ /* Flow is programmed in FPP */ table_entry->state = L2FLOW_STATE_FF; /* If timer already expired we'll die, it's ok though... */ - del_timer(&table_entry->timeout); + timer_delete(&table_entry->timeout); } else if(flags & L2FLOW_DENIED){ /* Flow is not programmed in FPP */ @@ -735,7 +735,7 @@ } /* Die soon or now */ - if(del_timer(&table_entry->timeout) || (table_entry->state == L2FLOW_STATE_FF)) + if(timer_delete(&table_entry->timeout) || (table_entry->state == L2FLOW_STATE_FF)) __abm_go_dying(table_entry); } else{ @@ -1093,7 +1093,7 @@ list_for_each_safe(entry, tmp, &l2flow_table[i]){ table_entry = container_of(entry, struct l2flowTable, list); table_entry->flags |= L2FLOW_FL_DEAD; - if(del_timer(&table_entry->timeout) || table_entry->state == L2FLOW_STATE_FF) + if(timer_delete(&table_entry->timeout) || table_entry->state == L2FLOW_STATE_FF) __abm_go_dying(table_entry); } } -- 2.43.0