The following commit has been merged in the master branch: commit 7f9f02cb83a6a85fea1482191405a9ce37558479 Author: Sven Eckelmann sven@narfation.org Date: Sat May 12 18:33:58 2012 +0200

batman-adv: Prefix hash local static functions with batadv_

All non-static symbols of batman-adv were prefixed with batadv_ to avoid collisions with other symbols of the kernel. Other symbols of batman-adv should use the same prefix to keep the naming scheme consistent.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index e39f8f4..1fb961c 100644 --- a/net/batman-adv/hash.c +++ b/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: