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

Commit 8248a4c7 authored Aug 04, 2015 by Marek Lindner Committed by Antonio Quartulli Dec 16, 2015

batman-adv: add bat_hardif_neigh_init algo ops call



Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

parent cef63419

net/batman-adv/originator.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -539,6 +539,7 @@ static struct batadv_hardif_neigh_node *
	batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,		batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,
	const u8 *neigh_addr)		const u8 *neigh_addr)
	{		{
			struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
	struct batadv_hardif_neigh_node *hardif_neigh = NULL;		struct batadv_hardif_neigh_node *hardif_neigh = NULL;

	spin_lock_bh(&hard_iface->neigh_list_lock);		spin_lock_bh(&hard_iface->neigh_list_lock);
	@@ -564,6 +565,9 @@ batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,

	atomic_set(&hardif_neigh->refcount, 1);		atomic_set(&hardif_neigh->refcount, 1);

			if (bat_priv->bat_algo_ops->bat_hardif_neigh_init)
			bat_priv->bat_algo_ops->bat_hardif_neigh_init(hardif_neigh);

	hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list);		hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list);

	out:		out:

net/batman-adv/types.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1153,6 +1153,7 @@ struct batadv_forw_packet {
	* @bat_primary_iface_set: called when primary interface is selected / changed		* @bat_primary_iface_set: called when primary interface is selected / changed
	* @bat_ogm_schedule: prepare a new outgoing OGM for the send queue		* @bat_ogm_schedule: prepare a new outgoing OGM for the send queue
	* @bat_ogm_emit: send scheduled OGM		* @bat_ogm_emit: send scheduled OGM
			* @bat_hardif_neigh_init: called on creation of single hop entry
	* @bat_neigh_cmp: compare the metrics of two neighbors for their respective		* @bat_neigh_cmp: compare the metrics of two neighbors for their respective
	* outgoing interfaces		* outgoing interfaces
	* @bat_neigh_is_equiv_or_better: check if neigh1 is equally good or better		* @bat_neigh_is_equiv_or_better: check if neigh1 is equally good or better
	@@ -1178,6 +1179,7 @@ struct batadv_algo_ops {
	void (bat_ogm_schedule)(struct batadv_hard_iface hard_iface);		void (bat_ogm_schedule)(struct batadv_hard_iface hard_iface);
	void (bat_ogm_emit)(struct batadv_forw_packet forw_packet);		void (bat_ogm_emit)(struct batadv_forw_packet forw_packet);
	/* neigh_node handling API */		/* neigh_node handling API */
			void (bat_hardif_neigh_init)(struct batadv_hardif_neigh_node neigh);
	int (bat_neigh_cmp)(struct batadv_neigh_node neigh1,		int (bat_neigh_cmp)(struct batadv_neigh_node neigh1,
	struct batadv_hard_iface *if_outgoing1,		struct batadv_hard_iface *if_outgoing1,
	struct batadv_neigh_node *neigh2,		struct batadv_neigh_node *neigh2,