batman-adv: a delayed_work has to be initialised once

A delayed_work struct does not need to be initialized each
every time before being enqueued. Therefore the
INIT_DELAYED_WORK() macro should be used during the
initialization process only.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

1 files changed, 6 insertions, 12 deletions

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 5e834c1df469..bb5fbd64dc28 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1100,16 +1100,6 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
         }
 }
 
-
-
-/* (re)start the timer */
-static void batadv_bla_start_timer(struct batadv_priv *bat_priv)
-{
-        INIT_DELAYED_WORK(&bat_priv->bla.work, batadv_bla_periodic_work);
-        queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work,
-                           msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));
-}
-
 /* periodic work to do:
  *  * purge structures when they are too old
  *  * send announcements
@@ -1180,7 +1170,8 @@ out:
         if (primary_if)
                 batadv_hardif_free_ref(primary_if);
 
-        batadv_bla_start_timer(bat_priv);
+        queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work,
+                           msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));
 }
 
 /* The hash for claim and backbone hash receive the same key because they
@@ -1238,7 +1229,10 @@ int batadv_bla_init(struct batadv_priv *bat_priv)
 
         batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hashes initialized\n");
 
-        batadv_bla_start_timer(bat_priv);
+        INIT_DELAYED_WORK(&bat_priv->bla.work, batadv_bla_periodic_work);
+
+        queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work,
+                           msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));
         return 0;
 }