batman-adv: Prefix vis 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:

committed by
Antonio Quartulli

parent
88ed1e7772
commit
d0f714f472
@@ -188,7 +188,7 @@ static ssize_t vis_data_read_entry(char *buff,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int vis_seq_print_text(struct seq_file *seq, void *offset)
|
||||
int batadv_vis_seq_print_text(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct hard_iface *primary_if;
|
||||
struct hlist_node *node;
|
||||
@@ -483,9 +483,9 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv,
|
||||
}
|
||||
|
||||
/* handle the server sync packet, forward if needed. */
|
||||
void receive_server_sync_packet(struct bat_priv *bat_priv,
|
||||
struct vis_packet *vis_packet,
|
||||
int vis_info_len)
|
||||
void batadv_receive_server_sync_packet(struct bat_priv *bat_priv,
|
||||
struct vis_packet *vis_packet,
|
||||
int vis_info_len)
|
||||
{
|
||||
struct vis_info *info;
|
||||
int is_new, make_broadcast;
|
||||
@@ -508,9 +508,9 @@ end:
|
||||
}
|
||||
|
||||
/* handle an incoming client update packet and schedule forward if needed. */
|
||||
void receive_client_update_packet(struct bat_priv *bat_priv,
|
||||
struct vis_packet *vis_packet,
|
||||
int vis_info_len)
|
||||
void batadv_receive_client_update_packet(struct bat_priv *bat_priv,
|
||||
struct vis_packet *vis_packet,
|
||||
int vis_info_len)
|
||||
{
|
||||
struct vis_info *info;
|
||||
struct vis_packet *packet;
|
||||
@@ -880,7 +880,7 @@ static void send_vis_packets(struct work_struct *work)
|
||||
|
||||
/* init the vis server. this may only be called when if_list is already
|
||||
* initialized (e.g. bat0 is initialized, interfaces have been added) */
|
||||
int vis_init(struct bat_priv *bat_priv)
|
||||
int batadv_vis_init(struct bat_priv *bat_priv)
|
||||
{
|
||||
struct vis_packet *packet;
|
||||
int hash_added;
|
||||
@@ -944,7 +944,7 @@ free_info:
|
||||
bat_priv->my_vis_info = NULL;
|
||||
err:
|
||||
spin_unlock_bh(&bat_priv->vis_hash_lock);
|
||||
vis_quit(bat_priv);
|
||||
batadv_vis_quit(bat_priv);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
@@ -959,7 +959,7 @@ static void free_info_ref(struct hlist_node *node, void *arg)
|
||||
}
|
||||
|
||||
/* shutdown vis-server */
|
||||
void vis_quit(struct bat_priv *bat_priv)
|
||||
void batadv_vis_quit(struct bat_priv *bat_priv)
|
||||
{
|
||||
if (!bat_priv->vis_hash)
|
||||
return;
|
||||
|
Reference in New Issue
Block a user