batman-adv: Prefix gateway-client 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, 4 insertions, 3 deletions

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index cf83c5422e9a..2f921bff84a9 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -361,7 +361,8 @@ static void _purge_orig(struct bat_priv *bat_priv)
                                           head, hash_entry) {
                         if (purge_orig_node(bat_priv, orig_node)) {
                                 if (orig_node->gw_flags)
-                                        gw_node_delete(bat_priv, orig_node);
+                                        batadv_gw_node_delete(bat_priv,
+                                                              orig_node);
                                 hlist_del_rcu(node);
                                 orig_node_free_ref(orig_node);
                                 continue;
@@ -374,8 +375,8 @@ static void _purge_orig(struct bat_priv *bat_priv)
                 spin_unlock_bh(list_lock);
         }
 
-        gw_node_purge(bat_priv);
-        gw_election(bat_priv);
+        batadv_gw_node_purge(bat_priv);
+        batadv_gw_election(bat_priv);
 }
 
 static void purge_orig(struct work_struct *work)