Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0f714f4 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

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: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent 88ed1e77

net/batman-adv/bat_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

net/batman-adv/main.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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);

net/batman-adv/routing.c

+4 −4
Original line number Diff line number Diff line
@@ -1151,12 +1151,12 @@ 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,

		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,

		batadv_receive_client_update_packet(bat_priv, vis_packet,

						    skb_headlen(skb));

		break;

net/batman-adv/vis.c

+10 −10
Original line number Diff line number Diff line
@@ -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,7 +483,7 @@ 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,

void batadv_receive_server_sync_packet(struct bat_priv *bat_priv,

				       struct vis_packet *vis_packet,

				       int vis_info_len)

{
@@ -508,7 +508,7 @@ 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,

void batadv_receive_client_update_packet(struct bat_priv *bat_priv,

					 struct vis_packet *vis_packet,

					 int vis_info_len)

{
@@ -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 @@ 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;

}
@@ -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;

net/batman-adv/vis.h

+9 −9
Original line number Diff line number Diff line
@@ -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,

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 receive_client_update_packet(struct bat_priv *bat_priv,

void batadv_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_init(struct bat_priv *bat_priv);

void batadv_vis_quit(struct bat_priv *bat_priv);



#endif /* _NET_BATMAN_ADV_VIS_H_ */