summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/hash.h
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 02:09:32 +0200
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 22:15:21 +0200
commit1a8eaf0733ca754533a03d6cfa4463def2b81ce3 (patch)
treebe806212d9109703e0d5d56708ff2efdf65c3d46 /net/batman-adv/hash.h
parent9563877ea52ea18bb4f1ed724c5e3a39bbbcf60b (diff)
downloadop-kernel-dev-1a8eaf0733ca754533a03d6cfa4463def2b81ce3.zip
op-kernel-dev-1a8eaf0733ca754533a03d6cfa4463def2b81ce3.tar.gz
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>
Diffstat (limited to 'net/batman-adv/hash.h')
-rw-r--r--net/batman-adv/hash.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h
index 3d67ce4..e75df6b 100644
--- a/net/batman-adv/hash.h
+++ b/net/batman-adv/hash.h
@@ -43,14 +43,14 @@ struct hashtable_t {
};
/* allocates and clears the hash */
-struct hashtable_t *hash_new(uint32_t size);
+struct hashtable_t *batadv_hash_new(uint32_t size);
/* set class key for all locks */
void batadv_hash_set_lock_class(struct hashtable_t *hash,
struct lock_class_key *key);
/* free only the hashtable and the hash itself. */
-void hash_destroy(struct hashtable_t *hash);
+void batadv_hash_destroy(struct hashtable_t *hash);
/* remove the hash structure. if hashdata_free_cb != NULL, this function will be
* called to remove the elements inside of the hash. if you don't remove the
@@ -77,7 +77,7 @@ static inline void hash_delete(struct hashtable_t *hash,
spin_unlock_bh(list_lock);
}
- hash_destroy(hash);
+ batadv_hash_destroy(hash);
}
/**
OpenPOWER on IntegriCloud