Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit e46832d53287311e801ebb9f9fb09ea63b34f5d2 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Aug 4 21:09:56 2015 +0800

batman-adv: add bat_hardif_neigh_init algo ops call

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

e46832d53287311e801ebb9f9fb09ea63b34f5d2 net/batman-adv/originator.c | 4 ++++ net/batman-adv/types.h | 2 ++ 2 files changed, 6 insertions(+)

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 1a6c744..b412887 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -538,6 +538,7 @@ static struct batadv_hardif_neigh_node * batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface, const u8 *neigh_addr) { + struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hardif_neigh_node *hardif_neigh = NULL;

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

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);

out: diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 71c7d9f..838d55e 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1153,6 +1153,7 @@ struct batadv_forw_packet { * @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_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 * outgoing interfaces * @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_emit)(struct batadv_forw_packet *forw_packet); /* neigh_node handling API */ + void (*bat_hardif_neigh_init)(struct batadv_hardif_neigh_node *neigh); int (*bat_neigh_cmp)(struct batadv_neigh_node *neigh1, struct batadv_hard_iface *if_outgoing1, struct batadv_neigh_node *neigh2,