Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6649feb authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-net-for-davem-20190808' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
Here are some batman-adv bugfixes:

 - Fix netlink dumping of all mcast_flags buckets, by Sven Eckelmann

 - Fix deletion of RTR(4|6) mcast list entries, by Sven Eckelmann
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 33920f1e f7af86cc

net/batman-adv/multicast.c

+5 −3
Original line number Diff line number Diff line
@@ -2303,7 +2303,7 @@ __batadv_mcast_flags_dump(struct sk_buff *msg, u32 portid, 


	while (bucket_tmp < hash->size) {

		if (batadv_mcast_flags_dump_bucket(msg, portid, cb, hash,

						   *bucket, &idx_tmp))

						   bucket_tmp, &idx_tmp))

			break;



		bucket_tmp++;
@@ -2420,8 +2420,10 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) 
	batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);

	batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS);

	batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS);

	batadv_mcast_want_rtr4_update(bat_priv, orig, BATADV_NO_FLAGS);

	batadv_mcast_want_rtr6_update(bat_priv, orig, BATADV_NO_FLAGS);

	batadv_mcast_want_rtr4_update(bat_priv, orig,

				      BATADV_MCAST_WANT_NO_RTR4);

	batadv_mcast_want_rtr6_update(bat_priv, orig,

				      BATADV_MCAST_WANT_NO_RTR6);



	spin_unlock_bh(&orig->mcast_handler_lock);

}