Merge tag 'batadv-net-for-davem-20200306' of git://git.open-mesh.org/linux-merge (23620594) · Commits · 戴 / test

Simon Wunderlich says: ==================== Here is a batman-adv bugfix: - Don't schedule OGM for disabled interface, by Sven Eckelmann ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

net/batman-adv/bat_iv_ogm.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -789,6 +789,10 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface)

		lockdep_assert_held(&hard_iface->bat_iv.ogm_buff_mutex);

		/* interface already disabled by batadv_iv_ogm_iface_disable */
		if (!*ogm_buff)
		return;

		/* the interface gets activated here to avoid race conditions between
		* the moment of activating the interface in
		* hardif_activate_interface() where the originator mac is set and

Admin message