aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/hash.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/hash.h')
-rw-r--r--net/batman-adv/hash.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h
index eba8f2a55ccc..7ec4e5b0bd41 100644
--- a/net/batman-adv/hash.h
+++ b/net/batman-adv/hash.h
@@ -54,8 +54,8 @@ void batadv_hash_destroy(struct hashtable_t *hash);
54 * called to remove the elements inside of the hash. if you don't remove the 54 * called to remove the elements inside of the hash. if you don't remove the
55 * elements, memory might be leaked. 55 * elements, memory might be leaked.
56 */ 56 */
57static inline void hash_delete(struct hashtable_t *hash, 57static inline void batadv_hash_delete(struct hashtable_t *hash,
58 hashdata_free_cb free_cb, void *arg) 58 hashdata_free_cb free_cb, void *arg)
59{ 59{
60 struct hlist_head *head; 60 struct hlist_head *head;
61 struct hlist_node *node, *node_tmp; 61 struct hlist_node *node, *node_tmp;
@@ -89,10 +89,11 @@ static inline void hash_delete(struct hashtable_t *hash,
89 * Returns 0 on success, 1 if the element already is in the hash 89 * Returns 0 on success, 1 if the element already is in the hash
90 * and -1 on error. 90 * and -1 on error.
91 */ 91 */
92static inline int hash_add(struct hashtable_t *hash, 92static inline int batadv_hash_add(struct hashtable_t *hash,
93 hashdata_compare_cb compare, 93 hashdata_compare_cb compare,
94 hashdata_choose_cb choose, 94 hashdata_choose_cb choose,
95 const void *data, struct hlist_node *data_node) 95 const void *data,
96 struct hlist_node *data_node)
96{ 97{
97 uint32_t index; 98 uint32_t index;
98 int ret = -1; 99 int ret = -1;
@@ -133,9 +134,9 @@ out:
133 * structure you use with just the key filled, we just need the key for 134 * structure you use with just the key filled, we just need the key for
134 * comparing. 135 * comparing.
135 */ 136 */
136static inline void *hash_remove(struct hashtable_t *hash, 137static inline void *batadv_hash_remove(struct hashtable_t *hash,
137 hashdata_compare_cb compare, 138 hashdata_compare_cb compare,
138 hashdata_choose_cb choose, void *data) 139 hashdata_choose_cb choose, void *data)
139{ 140{
140 uint32_t index; 141 uint32_t index;
141 struct hlist_node *node; 142 struct hlist_node *node;