From: Marek Lindner <lindner_marek@yahoo.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Marek Lindner <lindner_marek@yahoo.de>
Subject: [B.A.T.M.A.N.] [PATCHv2] batman_adv: fix namespace for neigh_node_new function
Date: Fri, 11 May 2012 00:49:34 +0800 [thread overview]
Message-ID: <1336668574-16655-1-git-send-email-lindner_marek@yahoo.de> (raw)
In-Reply-To: <1336629692-32288-1-git-send-email-lindner_marek@yahoo.de>
Should be merged with 0c9a249ef4dcaf733f6c7f64d4ce5c97b4705968
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
- v2: renamed batman_adv prefix to batadv.
bat_iv_ogm.c | 2 +-
originator.c | 5 +++--
originator.h | 5 +++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 837c8a6..984cafe 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -38,7 +38,7 @@ static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface,
{
struct neigh_node *neigh_node;
- neigh_node = neigh_node_new(hard_iface, neigh_addr, seqno);
+ neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, seqno);
if (!neigh_node)
goto out;
diff --git a/originator.c b/originator.c
index 30889c9..c6a00b3 100644
--- a/originator.c
+++ b/originator.c
@@ -86,8 +86,9 @@ struct neigh_node *orig_node_get_router(struct orig_node *orig_node)
return router;
}
-struct neigh_node *neigh_node_new(struct hard_iface *hard_iface,
- const uint8_t *neigh_addr, uint32_t seqno)
+struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface,
+ const uint8_t *neigh_addr,
+ uint32_t seqno)
{
struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
struct neigh_node *neigh_node;
diff --git a/originator.h b/originator.h
index 64c5d94..f74d0d6 100644
--- a/originator.h
+++ b/originator.h
@@ -29,8 +29,9 @@ void originator_free(struct bat_priv *bat_priv);
void purge_orig_ref(struct bat_priv *bat_priv);
void orig_node_free_ref(struct orig_node *orig_node);
struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr);
-struct neigh_node *neigh_node_new(struct hard_iface *hard_iface,
- const uint8_t *neigh_addr, uint32_t seqno);
+struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface,
+ const uint8_t *neigh_addr,
+ uint32_t seqno);
void neigh_node_free_ref(struct neigh_node *neigh_node);
struct neigh_node *orig_node_get_router(struct orig_node *orig_node);
int orig_seq_print_text(struct seq_file *seq, void *offset);
--
1.7.9.1
next prev parent reply other threads:[~2012-05-10 16:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 6:01 [B.A.T.M.A.N.] [PATCH] batman_adv: fix namespace for neigh_node_new function Marek Lindner
2012-05-10 16:49 ` Marek Lindner [this message]
2012-05-11 7:33 ` [B.A.T.M.A.N.] [PATCHv2] " 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=1336668574-16655-1-git-send-email-lindner_marek@yahoo.de \
--to=lindner_marek@yahoo.de \
--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).