diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 07:48:56 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-24 12:41:41 -0400 |
commit | da641193dd3117ccd408dc589a131f16286b0da0 (patch) | |
tree | b819cd7c61837e6c7c889e76fb9a38f6c83d4f54 /net/batman-adv/originator.h | |
parent | c0a559295eb2601602f7dc88f4240afcd666f73a (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.h | 8 |
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); | |||
41 | /* hashfunction to choose an entry in a hash table of given size | 41 | /* hashfunction to choose an entry in a hash table of given size |
42 | * hash algorithm from http://en.wikipedia.org/wiki/Hash_table | 42 | * hash algorithm from http://en.wikipedia.org/wiki/Hash_table |
43 | */ | 43 | */ |
44 | static inline uint32_t choose_orig(const void *data, uint32_t size) | 44 | static inline uint32_t batadv_choose_orig(const void *data, uint32_t size) |
45 | { | 45 | { |
46 | const unsigned char *key = data; | 46 | const unsigned char *key = data; |
47 | uint32_t hash = 0; | 47 | uint32_t hash = 0; |
@@ -60,8 +60,8 @@ static inline uint32_t choose_orig(const void *data, uint32_t size) | |||
60 | return hash % size; | 60 | return hash % size; |
61 | } | 61 | } |
62 | 62 | ||
63 | static inline struct orig_node *orig_hash_find(struct bat_priv *bat_priv, | 63 | static inline struct orig_node *batadv_orig_hash_find(struct bat_priv *bat_priv, |
64 | const void *data) | 64 | const void *data) |
65 | { | 65 | { |
66 | struct hashtable_t *hash = bat_priv->orig_hash; | 66 | struct hashtable_t *hash = bat_priv->orig_hash; |
67 | struct hlist_head *head; | 67 | struct hlist_head *head; |
@@ -72,7 +72,7 @@ static inline struct orig_node *orig_hash_find(struct bat_priv *bat_priv, | |||
72 | if (!hash) | 72 | if (!hash) |
73 | return NULL; | 73 | return NULL; |
74 | 74 | ||
75 | index = choose_orig(data, hash->size); | 75 | index = batadv_choose_orig(data, hash->size); |
76 | head = &hash->table[index]; | 76 | head = &hash->table[index]; |
77 | 77 | ||
78 | rcu_read_lock(); | 78 | rcu_read_lock(); |