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>

diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c
index 7b294b431f881023f9a03bfad2a32ace63d37bbb..9177a061990685dbd3401213908d22d12bd78297 100644 (file)
--- a/net/batman-adv/bat_debugfs.c
+++ b/net/batman-adv/bat_debugfs.c
@@ -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)

diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index d27db8192e93c06be69089ff36e0722b502a39cf..38ca3a853a2b5be6b0f80e1248b289f1376ae1a6 100644 (file)
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -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];
 

diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
index 380ed4c2443add30aaf505492287ffb3c53af214..7b8863668490ac55677230410c9f48d47ed5355c 100644 (file)
--- a/net/batman-adv/icmp_socket.h
+++ b/net/batman-adv/icmp_socket.h
@@ -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_ */

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 8e4083612523972e211d77d8caf38635398f4440..84dbda50aa9075639d5c02551dae454cca5a7032 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -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);

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 5b5feb496d8de03e78818eaf7b13943d09041ea6..7525e4fd2faf896876a64c39a3382668f560efe3 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -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;
        }