Commit 182620ab authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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/20230607155515.548120-1-sw@simonwunderlich.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a9f31047 abac3ac9

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

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ static void batadv_dat_purge(struct work_struct *work); 
 */

static void batadv_dat_start_timer(struct batadv_priv *bat_priv)

{

	INIT_DELAYED_WORK(&bat_priv->dat.work, batadv_dat_purge);

	queue_delayed_work(batadv_event_workqueue, &bat_priv->dat.work,

			   msecs_to_jiffies(10000));

}
@@ -819,6 +818,7 @@ int batadv_dat_init(struct batadv_priv *bat_priv) 
	if (!bat_priv->dat.hash)

		return -ENOMEM;



	INIT_DELAYED_WORK(&bat_priv->dat.work, batadv_dat_purge);

	batadv_dat_start_timer(bat_priv);



	batadv_tvlv_handler_register(bat_priv, batadv_dat_tvlv_ogm_handler_v1,