diff --git a/[refs] b/[refs]
index 733bca353c9d..4a28f59de1f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18a1cb6ee08e6ea62e0f3c2643435cd444fc0790
+refs/heads/master: 7f9f02cb83a6a85fea1482191405a9ce37558479
diff --git a/trunk/net/batman-adv/hash.c b/trunk/net/batman-adv/hash.c
index e39f8f4bb165..1fb961c8d9a0 100644
--- a/trunk/net/batman-adv/hash.c
+++ b/trunk/net/batman-adv/hash.c
@@ -21,7 +21,7 @@
 #include "hash.h"
 
 /* clears the hash */
-static void hash_init(struct hashtable_t *hash)
+static void batadv_hash_init(struct hashtable_t *hash)
 {
 	uint32_t i;
 
@@ -58,7 +58,7 @@ struct hashtable_t *batadv_hash_new(uint32_t size)
 		goto free_table;
 
 	hash->size = size;
-	hash_init(hash);
+	batadv_hash_init(hash);
 	return hash;
 
 free_table: