summaryrefslogtreecommitdiff
path: root/net/batman-adv/originator.h
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 13:48:56 +0200
committerAntonio Quartulli <ordex@autistici.org>2012-06-24 18:41:41 +0200
commitda641193dd3117ccd408dc589a131f16286b0da0 (patch)
treeb819cd7c61837e6c7c889e76fb9a38f6c83d4f54 /net/batman-adv/originator.h
parentc0a559295eb2601602f7dc88f4240afcd666f73a (diff)
batman-adv: Prefix originator static inline 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>
Diffstat (limited to 'net/batman-adv/originator.h')
-rw-r--r--net/batman-adv/originator.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h
index a72171997056..c4f63b4d54a7 100644
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@ -41,7 +41,7 @@ int batadv_orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num);
/* hashfunction to choose an entry in a hash table of given size
* hash algorithm from http://en.wikipedia.org/wiki/Hash_table
*/
-static inline uint32_t choose_orig(const void *data, uint32_t size)
+static inline uint32_t batadv_choose_orig(const void *data, uint32_t size)
{
const unsigned char *key = data;
uint32_t hash = 0;
@@ -60,8 +60,8 @@ static inline uint32_t choose_orig(const void *data, uint32_t size)
return hash % size;
}
-static inline struct orig_node *orig_hash_find(struct bat_priv *bat_priv,
- const void *data)
+static inline struct orig_node *batadv_orig_hash_find(struct bat_priv *bat_priv,
+ const void *data)
{
struct hashtable_t *hash = bat_priv->orig_hash;
struct hlist_head *head;
@@ -72,7 +72,7 @@ static inline struct orig_node *orig_hash_find(struct bat_priv *bat_priv,
if (!hash)
return NULL;
- index = choose_orig(data, hash->size);
+ index = batadv_choose_orig(data, hash->size);
head = &hash->table[index];
rcu_read_lock();