batman-adv: Prefix icmp-socket 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
1a8eaf0733
commit
9039dc7e8a
5 changed files with 11 additions and 11 deletions
|
@ -349,7 +349,7 @@ int batadv_debugfs_add_meshif(struct net_device *dev)
|
|||
if (!bat_priv->debug_dir)
|
||||
goto out;
|
||||
|
||||
if (bat_socket_setup(bat_priv) < 0)
|
||||
if (batadv_socket_setup(bat_priv) < 0)
|
||||
goto rem_attr;
|
||||
|
||||
if (debug_log_setup(bat_priv) < 0)
|
||||
|
|
|
@ -34,7 +34,7 @@ static void bat_socket_add_packet(struct socket_client *socket_client,
|
|||
struct icmp_packet_rr *icmp_packet,
|
||||
size_t icmp_len);
|
||||
|
||||
void bat_socket_init(void)
|
||||
void batadv_socket_init(void)
|
||||
{
|
||||
memset(socket_client_hash, 0, sizeof(socket_client_hash));
|
||||
}
|
||||
|
@ -276,7 +276,7 @@ static const struct file_operations fops = {
|
|||
.llseek = no_llseek,
|
||||
};
|
||||
|
||||
int bat_socket_setup(struct bat_priv *bat_priv)
|
||||
int batadv_socket_setup(struct bat_priv *bat_priv)
|
||||
{
|
||||
struct dentry *d;
|
||||
|
||||
|
@ -336,8 +336,8 @@ static void bat_socket_add_packet(struct socket_client *socket_client,
|
|||
wake_up(&socket_client->queue_wait);
|
||||
}
|
||||
|
||||
void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
|
||||
size_t icmp_len)
|
||||
void batadv_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
|
||||
size_t icmp_len)
|
||||
{
|
||||
struct socket_client *hash = socket_client_hash[icmp_packet->uid];
|
||||
|
||||
|
|
|
@ -24,9 +24,9 @@
|
|||
|
||||
#define ICMP_SOCKET "socket"
|
||||
|
||||
void bat_socket_init(void);
|
||||
int bat_socket_setup(struct bat_priv *bat_priv);
|
||||
void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
|
||||
size_t icmp_len);
|
||||
void batadv_socket_init(void);
|
||||
int batadv_socket_setup(struct bat_priv *bat_priv);
|
||||
void batadv_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
|
||||
size_t icmp_len);
|
||||
|
||||
#endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */
|
||||
|
|
|
@ -65,7 +65,7 @@ static int __init batman_init(void)
|
|||
if (!bat_event_workqueue)
|
||||
return -ENOMEM;
|
||||
|
||||
bat_socket_init();
|
||||
batadv_socket_init();
|
||||
batadv_debugfs_init();
|
||||
|
||||
register_netdevice_notifier(&batadv_hard_if_notifier);
|
||||
|
|
|
@ -289,7 +289,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv,
|
|||
|
||||
/* add data to device queue */
|
||||
if (icmp_packet->msg_type != ECHO_REQUEST) {
|
||||
bat_socket_receive_packet(icmp_packet, icmp_len);
|
||||
batadv_socket_receive_packet(icmp_packet, icmp_len);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue