1 files changed, 6 insertions, 0 deletions

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 24a9300b08e0..ffd9dfbd9b0e 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -27,6 +27,7 @@
 #include "bridge_loop_avoidance.h"
 #include "network-coding.h"
 #include "fragmentation.h"
+#include "multicast.h"
 
 /* hash class keys */
 static struct lock_class_key batadv_orig_hash_lock_class_key;
@@ -557,6 +558,8 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu)
         }
         spin_unlock_bh(&orig_node->neigh_list_lock);
 
+        batadv_mcast_purge_orig(orig_node);
+
         /* Free nc_nodes */
         batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);
 
@@ -672,6 +675,9 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,
         orig_node->tt_buff_len = 0;
         reset_time = jiffies - 1 - msecs_to_jiffies(BATADV_RESET_PROTECTION_MS);
         orig_node->bcast_seqno_reset = reset_time;
+#ifdef CONFIG_BATMAN_ADV_MCAST
+        orig_node->mcast_flags = BATADV_NO_FLAGS;
+#endif
 
         /* create a vlan object for the "untagged" LAN */
         vlan = batadv_orig_node_vlan_new(orig_node, BATADV_NO_FLAGS);