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>
This commit is contained in:
parent
9563877ea5
commit
1a8eaf0733
|
@ -1166,8 +1166,8 @@ int batadv_bla_init(struct bat_priv *bat_priv)
|
||||||
if (bat_priv->claim_hash)
|
if (bat_priv->claim_hash)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
bat_priv->claim_hash = hash_new(128);
|
bat_priv->claim_hash = batadv_hash_new(128);
|
||||||
bat_priv->backbone_hash = hash_new(32);
|
bat_priv->backbone_hash = batadv_hash_new(32);
|
||||||
|
|
||||||
if (!bat_priv->claim_hash || !bat_priv->backbone_hash)
|
if (!bat_priv->claim_hash || !bat_priv->backbone_hash)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -1348,12 +1348,12 @@ void batadv_bla_free(struct bat_priv *bat_priv)
|
||||||
|
|
||||||
if (bat_priv->claim_hash) {
|
if (bat_priv->claim_hash) {
|
||||||
bla_purge_claims(bat_priv, primary_if, 1);
|
bla_purge_claims(bat_priv, primary_if, 1);
|
||||||
hash_destroy(bat_priv->claim_hash);
|
batadv_hash_destroy(bat_priv->claim_hash);
|
||||||
bat_priv->claim_hash = NULL;
|
bat_priv->claim_hash = NULL;
|
||||||
}
|
}
|
||||||
if (bat_priv->backbone_hash) {
|
if (bat_priv->backbone_hash) {
|
||||||
bla_purge_backbone_gw(bat_priv, 1);
|
bla_purge_backbone_gw(bat_priv, 1);
|
||||||
hash_destroy(bat_priv->backbone_hash);
|
batadv_hash_destroy(bat_priv->backbone_hash);
|
||||||
bat_priv->backbone_hash = NULL;
|
bat_priv->backbone_hash = NULL;
|
||||||
}
|
}
|
||||||
if (primary_if)
|
if (primary_if)
|
||||||
|
|
|
@ -34,7 +34,7 @@ static void hash_init(struct hashtable_t *hash)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* free only the hashtable and the hash itself. */
|
/* free only the hashtable and the hash itself. */
|
||||||
void hash_destroy(struct hashtable_t *hash)
|
void batadv_hash_destroy(struct hashtable_t *hash)
|
||||||
{
|
{
|
||||||
kfree(hash->list_locks);
|
kfree(hash->list_locks);
|
||||||
kfree(hash->table);
|
kfree(hash->table);
|
||||||
|
@ -42,7 +42,7 @@ void hash_destroy(struct hashtable_t *hash)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* allocates and clears the hash */
|
/* allocates and clears the hash */
|
||||||
struct hashtable_t *hash_new(uint32_t size)
|
struct hashtable_t *batadv_hash_new(uint32_t size)
|
||||||
{
|
{
|
||||||
struct hashtable_t *hash;
|
struct hashtable_t *hash;
|
||||||
|
|
||||||
|
|
|
@ -43,14 +43,14 @@ struct hashtable_t {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* allocates and clears the hash */
|
/* 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 */
|
/* set class key for all locks */
|
||||||
void batadv_hash_set_lock_class(struct hashtable_t *hash,
|
void batadv_hash_set_lock_class(struct hashtable_t *hash,
|
||||||
struct lock_class_key *key);
|
struct lock_class_key *key);
|
||||||
|
|
||||||
/* free only the hashtable and the hash itself. */
|
/* 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
|
/* 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
|
* 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);
|
spin_unlock_bh(list_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
hash_destroy(hash);
|
batadv_hash_destroy(hash);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -52,7 +52,7 @@ int originator_init(struct bat_priv *bat_priv)
|
||||||
if (bat_priv->orig_hash)
|
if (bat_priv->orig_hash)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
bat_priv->orig_hash = hash_new(1024);
|
bat_priv->orig_hash = batadv_hash_new(1024);
|
||||||
|
|
||||||
if (!bat_priv->orig_hash)
|
if (!bat_priv->orig_hash)
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -184,7 +184,7 @@ void originator_free(struct bat_priv *bat_priv)
|
||||||
spin_unlock_bh(list_lock);
|
spin_unlock_bh(list_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
hash_destroy(hash);
|
batadv_hash_destroy(hash);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* this function finds or creates an originator entry for the given
|
/* this function finds or creates an originator entry for the given
|
||||||
|
|
|
@ -183,7 +183,7 @@ static int tt_local_init(struct bat_priv *bat_priv)
|
||||||
if (bat_priv->tt_local_hash)
|
if (bat_priv->tt_local_hash)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
bat_priv->tt_local_hash = hash_new(1024);
|
bat_priv->tt_local_hash = batadv_hash_new(1024);
|
||||||
|
|
||||||
if (!bat_priv->tt_local_hash)
|
if (!bat_priv->tt_local_hash)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -531,7 +531,7 @@ static void tt_local_table_free(struct bat_priv *bat_priv)
|
||||||
spin_unlock_bh(list_lock);
|
spin_unlock_bh(list_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
hash_destroy(hash);
|
batadv_hash_destroy(hash);
|
||||||
|
|
||||||
bat_priv->tt_local_hash = NULL;
|
bat_priv->tt_local_hash = NULL;
|
||||||
}
|
}
|
||||||
|
@ -541,7 +541,7 @@ static int tt_global_init(struct bat_priv *bat_priv)
|
||||||
if (bat_priv->tt_global_hash)
|
if (bat_priv->tt_global_hash)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
bat_priv->tt_global_hash = hash_new(1024);
|
bat_priv->tt_global_hash = batadv_hash_new(1024);
|
||||||
|
|
||||||
if (!bat_priv->tt_global_hash)
|
if (!bat_priv->tt_global_hash)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -1031,7 +1031,7 @@ static void tt_global_table_free(struct bat_priv *bat_priv)
|
||||||
spin_unlock_bh(list_lock);
|
spin_unlock_bh(list_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
hash_destroy(hash);
|
batadv_hash_destroy(hash);
|
||||||
|
|
||||||
bat_priv->tt_global_hash = NULL;
|
bat_priv->tt_global_hash = NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -889,7 +889,7 @@ int vis_init(struct bat_priv *bat_priv)
|
||||||
|
|
||||||
spin_lock_bh(&bat_priv->vis_hash_lock);
|
spin_lock_bh(&bat_priv->vis_hash_lock);
|
||||||
|
|
||||||
bat_priv->vis_hash = hash_new(256);
|
bat_priv->vis_hash = batadv_hash_new(256);
|
||||||
if (!bat_priv->vis_hash) {
|
if (!bat_priv->vis_hash) {
|
||||||
pr_err("Can't initialize vis_hash\n");
|
pr_err("Can't initialize vis_hash\n");
|
||||||
goto err;
|
goto err;
|
||||||
|
|
Reference in New Issue