1 files changed, 3 insertions, 8 deletions

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index 3feb9435b715..ec54e236e345 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -314,8 +314,6 @@ static void batadv_mcast_mla_list_free(struct hlist_head *mcast_list)
  * translation table except the ones listed in the given mcast_list.
  *
  * If mcast_list is NULL then all are retracted.
- *
- * Do not call outside of the mcast worker! (or cancel mcast worker first)
  */
 static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,
                                         struct hlist_head *mcast_list)
@@ -323,8 +321,6 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,
         struct batadv_hw_addr *mcast_entry;
         struct hlist_node *tmp;
 
-        WARN_ON(delayed_work_pending(&bat_priv->mcast.work));
-
         hlist_for_each_entry_safe(mcast_entry, tmp, &bat_priv->mcast.mla_list,
                                   list) {
                 if (mcast_list &&
@@ -348,8 +344,6 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,
  *
  * Adds multicast listener announcements from the given mcast_list to the
  * translation table if they have not been added yet.
- *
- * Do not call outside of the mcast worker! (or cancel mcast worker first)
  */
 static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,
                                     struct hlist_head *mcast_list)
@@ -357,8 +351,6 @@ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,
         struct batadv_hw_addr *mcast_entry;
         struct hlist_node *tmp;
 
-        WARN_ON(delayed_work_pending(&bat_priv->mcast.work));
-
         if (!mcast_list)
                 return;
 
@@ -647,7 +639,10 @@ static void batadv_mcast_mla_update(struct work_struct *work)
         priv_mcast = container_of(delayed_work, struct batadv_priv_mcast, work);
         bat_priv = container_of(priv_mcast, struct batadv_priv, mcast);
 
+        spin_lock(&bat_priv->mcast.mla_lock);
         __batadv_mcast_mla_update(bat_priv);
+        spin_unlock(&bat_priv->mcast.mla_lock);
+
         batadv_mcast_start_timer(bat_priv);
 }