---

yaml --- r: 314596 b: refs/heads/master c: 7f9f02c h: refs/heads/master v: v3
git-mirror · Jun 25, 2012 · 3745407 · 3745407
1 parent 78b8c0d
commit 3745407
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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: