batman_adv: fix namespace for neigh_node_new function
Commit Message
Should be merged with 0c9a249ef4dcaf733f6c7f64d4ce5c97b4705968
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
bat_iv_ogm.c | 2 +-
originator.c | 5 +++--
originator.h | 5 +++--
3 files changed, 7 insertions(+), 5 deletions(-)
@@ -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 = batman_adv_neigh_node_new(hard_iface, neigh_addr, seqno);
if (!neigh_node)
goto out;
@@ -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 *batman_adv_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;
@@ -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 *batman_adv_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);