batman-adv: Fix duplicated OGMs on NETDEV_UP (9e6b5648) · Commits · 戴 / test

The state of slave interfaces are handled differently depending on whether the interface is up or not. All active interfaces (IFF_UP) will transmit OGMs. But for B.A.T.M.A.N. IV, also non-active interfaces are scheduling (low TTL) OGMs on active interfaces. The code which setups and schedules the OGMs must therefore already be called when the interfaces gets added as slave interface and the transmit function must then check whether it has to send out the OGM or not on the specific slave interface. But the commit ("batman-adv: remove ogm_emit and ogm_schedule API calls") moved the setup code from the enable function to the activate function. The latter is called either when the added slave was already up when batadv_hardif_enable_interface processed the new interface or when a NETDEV_UP event was received for this slave interfac. As result, each NETDEV_UP would schedule a new OGM worker for the interface and thus OGMs would be send a lot more than expected. Fixes: ("batman-adv: remove ogm_emit and ogm_schedule API calls") Reported-by:

Linus Lüssing <linus.luessing@c0d3.blue> Tested-by:

Linus Lüssing <linus.luessing@c0d3.blue> Acked-by:

Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by:

Sven Eckelmann <sven@narfation.org> Signed-off-by:

Simon Wunderlich <sw@simonwunderlich.de>

net/batman-adv/bat_iv_ogm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2337,7 +2337,7 @@ batadv_iv_ogm_neigh_is_sob(struct batadv_neigh_node *neigh1,
		return ret;
		}

		static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface)
		static void batadv_iv_iface_enabled(struct batadv_hard_iface *hard_iface)
		{
		/* begin scheduling originator messages on that interface */
		batadv_iv_ogm_schedule(hard_iface);
		@@ -2683,8 +2683,8 @@ unlock:
		static struct batadv_algo_ops batadv_batman_iv __read_mostly = {
		.name = "BATMAN_IV",
		.iface = {
		.activate = batadv_iv_iface_activate,
		.enable = batadv_iv_ogm_iface_enable,
		.enabled = batadv_iv_iface_enabled,
		.disable = batadv_iv_ogm_iface_disable,
		.update_mac = batadv_iv_ogm_iface_update_mac,
		.primary_set = batadv_iv_ogm_primary_iface_set,

net/batman-adv/hard-interface.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -795,6 +795,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,

		batadv_hardif_recalc_extra_skbroom(soft_iface);

		if (bat_priv->algo_ops->iface.enabled)
		bat_priv->algo_ops->iface.enabled(hard_iface);

		out:
		return 0;

net/batman-adv/types.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -2129,6 +2129,9 @@ struct batadv_algo_iface_ops {
		/** @enable: init routing info when hard-interface is enabled */
		int (enable)(struct batadv_hard_iface hard_iface);

		/** @enabled: notification when hard-interface was enabled (optional) */
		void (enabled)(struct batadv_hard_iface hard_iface);

		/** @disable: de-init routing info when hard-interface is disabled */
		void (disable)(struct batadv_hard_iface hard_iface);

Admin message