Skip to content

Commit 182620a

Browse files
committed
Merge tag 'batadv-net-pullrequest-20230607' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says: ==================== Here is a batman-adv bugfix: - fix a broken sync while rescheduling delayed work, by Vladislav Efanov * tag 'batadv-net-pullrequest-20230607' of git://git.open-mesh.org/linux-merge: batman-adv: Broken sync while rescheduling delayed work ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents a9f3104 + abac3ac commit 182620a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/batman-adv/distributed-arp-table.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ static void batadv_dat_purge(struct work_struct *work);
101101
*/
102102
static void batadv_dat_start_timer(struct batadv_priv *bat_priv)
103103
{
104-
INIT_DELAYED_WORK(&bat_priv->dat.work, batadv_dat_purge);
105104
queue_delayed_work(batadv_event_workqueue, &bat_priv->dat.work,
106105
msecs_to_jiffies(10000));
107106
}
@@ -819,6 +818,7 @@ int batadv_dat_init(struct batadv_priv *bat_priv)
819818
if (!bat_priv->dat.hash)
820819
return -ENOMEM;
821820

821+
INIT_DELAYED_WORK(&bat_priv->dat.work, batadv_dat_purge);
822822
batadv_dat_start_timer(bat_priv);
823823

824824
batadv_tvlv_handler_register(bat_priv, batadv_dat_tvlv_ogm_handler_v1,

0 commit comments

Comments
 (0)