diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-11 20:09:32 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 16:15:21 -0400 |
commit | 1a8eaf0733ca754533a03d6cfa4463def2b81ce3 (patch) | |
tree | be806212d9109703e0d5d56708ff2efdf65c3d46 /net/batman-adv/originator.c | |
parent | 9563877ea52ea18bb4f1ed724c5e3a39bbbcf60b (diff) |
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/originator.c')
-rw-r--r-- | net/batman-adv/originator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 2f921bff84a9..410a197854ed 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c | |||
@@ -52,7 +52,7 @@ int originator_init(struct bat_priv *bat_priv) | |||
52 | if (bat_priv->orig_hash) | 52 | if (bat_priv->orig_hash) |
53 | return 0; | 53 | return 0; |
54 | 54 | ||
55 | bat_priv->orig_hash = hash_new(1024); | 55 | bat_priv->orig_hash = batadv_hash_new(1024); |
56 | 56 | ||
57 | if (!bat_priv->orig_hash) | 57 | if (!bat_priv->orig_hash) |
58 | goto err; | 58 | goto err; |
@@ -184,7 +184,7 @@ void originator_free(struct bat_priv *bat_priv) | |||
184 | spin_unlock_bh(list_lock); | 184 | spin_unlock_bh(list_lock); |
185 | } | 185 | } |
186 | 186 | ||
187 | hash_destroy(hash); | 187 | batadv_hash_destroy(hash); |
188 | } | 188 | } |
189 | 189 | ||
190 | /* this function finds or creates an originator entry for the given | 190 | /* this function finds or creates an originator entry for the given |