From: Marek Lindner <mareklindner@neomailbox.ch>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Marek Lindner <mareklindner@neomailbox.ch>
Subject: [B.A.T.M.A.N.] [PATCH 2/3] batman-adv: add bat_hardif_neigh_init algo ops call
Date: Sun, 26 Jul 2015 15:16:29 +0800 [thread overview]
Message-ID: <1437894990-15534-2-git-send-email-mareklindner@neomailbox.ch> (raw)
In-Reply-To: <1437894990-15534-1-git-send-email-mareklindner@neomailbox.ch>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
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 42a5fb2..615ad0f 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -534,6 +534,7 @@ batadv_hardif_neigh_get_or_create(struct batadv_hard_iface *hard_iface,
const u8 *neigh_addr)
{
struct batadv_hardif_neigh_node *hardif_neigh = NULL;
+ struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
hardif_neigh = batadv_hardif_neigh_get(hard_iface, neigh_addr);
if (hardif_neigh)
@@ -554,6 +555,9 @@ batadv_hardif_neigh_get_or_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);
+
spin_lock_bh(&hard_iface->neigh_list_lock);
hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list);
spin_unlock_bh(&hard_iface->neigh_list_lock);
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index ee12bf8..f9ec98d 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1154,6 +1154,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
@@ -1179,6 +1180,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,
--
2.1.4
next prev parent reply other threads:[~2015-07-26 7:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-26 7:16 [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: add list of unique single hop neighbors per hard-interface Marek Lindner
2015-07-26 7:16 ` Marek Lindner [this message]
2015-07-26 7:16 ` [B.A.T.M.A.N.] [PATCH 3/3] batman-adv: export singe hop neighbor list via debugfs Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437894990-15534-2-git-send-email-mareklindner@neomailbox.ch \
--to=mareklindner@neomailbox.ch \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).