Skip to content

Commit

Permalink
batman-adv: Prefix vis non-static functions with batadv_
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Sven Eckelmann authored and Antonio Quartulli committed Jun 20, 2012
1 parent 88ed1e7 commit d0f714f
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion net/batman-adv/bat_debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static int transtable_local_open(struct inode *inode, struct file *file)
static int vis_data_open(struct inode *inode, struct file *file)
{
struct net_device *net_dev = (struct net_device *)inode->i_private;
return single_open(file, vis_seq_print_text, net_dev);
return single_open(file, batadv_vis_seq_print_text, net_dev);
}

struct bat_debuginfo {
Expand Down
4 changes: 2 additions & 2 deletions net/batman-adv/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ int mesh_init(struct net_device *soft_iface)

batadv_tt_local_add(soft_iface, soft_iface->dev_addr, NULL_IFINDEX);

ret = vis_init(bat_priv);
ret = batadv_vis_init(bat_priv);
if (ret < 0)
goto err;

Expand All @@ -147,7 +147,7 @@ void mesh_free(struct net_device *soft_iface)

batadv_purge_outstanding_packets(bat_priv, NULL);

vis_quit(bat_priv);
batadv_vis_quit(bat_priv);

batadv_gw_node_purge(bat_priv);
batadv_originator_free(bat_priv);
Expand Down
8 changes: 4 additions & 4 deletions net/batman-adv/routing.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1151,13 +1151,13 @@ int batadv_recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if)

switch (vis_packet->vis_type) {
case VIS_TYPE_SERVER_SYNC:
receive_server_sync_packet(bat_priv, vis_packet,
skb_headlen(skb));
batadv_receive_server_sync_packet(bat_priv, vis_packet,
skb_headlen(skb));
break;

case VIS_TYPE_CLIENT_UPDATE:
receive_client_update_packet(bat_priv, vis_packet,
skb_headlen(skb));
batadv_receive_client_update_packet(bat_priv, vis_packet,
skb_headlen(skb));
break;

default: /* ignore unknown packet */
Expand Down
20 changes: 10 additions & 10 deletions net/batman-adv/vis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -508,9 +508,9 @@ void receive_server_sync_packet(struct bat_priv *bat_priv,
}

/* 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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -944,7 +944,7 @@ int vis_init(struct bat_priv *bat_priv)
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;
}

Expand All @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions net/batman-adv/vis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
#define VIS_TIMEOUT 200000 /* timeout of vis packets
* in miliseconds */

int vis_seq_print_text(struct seq_file *seq, void *offset);
void receive_server_sync_packet(struct bat_priv *bat_priv,
struct vis_packet *vis_packet,
int vis_info_len);
void receive_client_update_packet(struct bat_priv *bat_priv,
struct vis_packet *vis_packet,
int vis_info_len);
int vis_init(struct bat_priv *bat_priv);
void vis_quit(struct bat_priv *bat_priv);
int batadv_vis_seq_print_text(struct seq_file *seq, void *offset);
void batadv_receive_server_sync_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);
int batadv_vis_init(struct bat_priv *bat_priv);
void batadv_vis_quit(struct bat_priv *bat_priv);

#endif /* _NET_BATMAN_ADV_VIS_H_ */

0 comments on commit d0f714f

Please sign in to comment.