batman-adv: Prefix routing non-static functions with batadv_

batman-adv can be compiled as part of the kernel instead of an module. In that
case the linker will see all non-static symbols of batman-adv and all other
non-static symbols of the kernel. This could lead to symbol collisions. A
prefix for the batman-adv symbols that defines their private namespace avoids
such a problem.

Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 93585132049f..12c2e1ed2560 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -307,7 +307,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv,
                         neigh_purged = true;
 
                         hlist_del_rcu(&neigh_node->list);
-                        bonding_candidate_del(orig_node, neigh_node);
+                        batadv_bonding_candidate_del(orig_node, neigh_node);
                         batadv_neigh_node_free_ref(neigh_node);
                 } else {
                         if ((!*best_neigh_node) ||
@@ -334,7 +334,8 @@ static bool purge_orig_node(struct bat_priv *bat_priv,
         } else {
                 if (purge_orig_neighbors(bat_priv, orig_node,
                                          &best_neigh_node))
-                        update_route(bat_priv, orig_node, best_neigh_node);
+                        batadv_update_route(bat_priv, orig_node,
+                                            best_neigh_node);
         }
 
         return false;