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, 8 insertions, 9 deletions

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index fa88b2bec986..92a55fddf44b 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -34,13 +34,6 @@ static struct lock_class_key batadv_orig_hash_lock_class_key;
 
 static void batadv_purge_orig(struct work_struct *work);
 
-static void batadv_start_purge_timer(struct batadv_priv *bat_priv)
-{
-        INIT_DELAYED_WORK(&bat_priv->orig_work, batadv_purge_orig);
-        queue_delayed_work(batadv_event_workqueue,
-                           &bat_priv->orig_work, msecs_to_jiffies(1000));
-}
-
 /* returns 1 if they are the same originator */
 static int batadv_compare_orig(const struct hlist_node *node, const void *data2)
 {
@@ -63,7 +56,11 @@ int batadv_originator_init(struct batadv_priv *bat_priv)
         batadv_hash_set_lock_class(bat_priv->orig_hash,
                                    &batadv_orig_hash_lock_class_key);
 
-        batadv_start_purge_timer(bat_priv);
+        INIT_DELAYED_WORK(&bat_priv->orig_work, batadv_purge_orig);
+        queue_delayed_work(batadv_event_workqueue,
+                           &bat_priv->orig_work,
+                           msecs_to_jiffies(BATADV_ORIG_WORK_PERIOD));
+
         return 0;
 
 err:
@@ -396,7 +393,9 @@ static void batadv_purge_orig(struct work_struct *work)
         delayed_work = container_of(work, struct delayed_work, work);
         bat_priv = container_of(delayed_work, struct batadv_priv, orig_work);
         _batadv_purge_orig(bat_priv);
-        batadv_start_purge_timer(bat_priv);
+        queue_delayed_work(batadv_event_workqueue,
+                           &bat_priv->orig_work,
+                           msecs_to_jiffies(BATADV_ORIG_WORK_PERIOD));
 }
 
 void batadv_purge_orig_ref(struct batadv_priv *bat_priv)