batman-adv: Prefix hash 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, 4 deletions

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index b0561e338ae5..eb2178951c39 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1166,8 +1166,8 @@ int batadv_bla_init(struct bat_priv *bat_priv)
         if (bat_priv->claim_hash)
                 return 0;
 
-        bat_priv->claim_hash = hash_new(128);
-        bat_priv->backbone_hash = hash_new(32);
+        bat_priv->claim_hash = batadv_hash_new(128);
+        bat_priv->backbone_hash = batadv_hash_new(32);
 
         if (!bat_priv->claim_hash || !bat_priv->backbone_hash)
                 return -ENOMEM;
@@ -1348,12 +1348,12 @@ void batadv_bla_free(struct bat_priv *bat_priv)
 
         if (bat_priv->claim_hash) {
                 bla_purge_claims(bat_priv, primary_if, 1);
-                hash_destroy(bat_priv->claim_hash);
+                batadv_hash_destroy(bat_priv->claim_hash);
                 bat_priv->claim_hash = NULL;
         }
         if (bat_priv->backbone_hash) {
                 bla_purge_backbone_gw(bat_priv, 1);
-                hash_destroy(bat_priv->backbone_hash);
+                batadv_hash_destroy(bat_priv->backbone_hash);
                 bat_priv->backbone_hash = NULL;
         }
         if (primary_if)