batman-adv: Prefix bat_debugfs 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 db8273c26989c374a5c427aac89f6a16ec28cc34..444d10bc9552800dd06416df86c156e2807cb955 100644 (file)
--- a/net/batman-adv/bat_debugfs.c
+++ b/net/batman-adv/bat_debugfs.c
@@ -76,7 +76,7 @@ static int fdebug_log(struct debug_log *debug_log, const char *fmt, ...)
        return 0;
 }
 
-int debug_log(struct bat_priv *bat_priv, const char *fmt, ...)
+int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...)
 {
        va_list args;
        char tmp_log_buf[256];
@@ -304,7 +304,7 @@ static struct bat_debuginfo *mesh_debuginfos[] = {
        NULL,
 };
 
-void debugfs_init(void)
+void batadv_debugfs_init(void)
 {
        struct bat_debuginfo *bat_debug;
        struct dentry *file;
@@ -327,7 +327,7 @@ out:
        return;
 }
 
-void debugfs_destroy(void)
+void batadv_debugfs_destroy(void)
 {
        if (bat_debugfs) {
                debugfs_remove_recursive(bat_debugfs);
@@ -335,7 +335,7 @@ void debugfs_destroy(void)
        }
 }
 
-int debugfs_add_meshif(struct net_device *dev)
+int batadv_debugfs_add_meshif(struct net_device *dev)
 {
        struct bat_priv *bat_priv = netdev_priv(dev);
        struct bat_debuginfo **bat_debug;
@@ -378,7 +378,7 @@ out:
 #endif /* CONFIG_DEBUG_FS */
 }
 
-void debugfs_del_meshif(struct net_device *dev)
+void batadv_debugfs_del_meshif(struct net_device *dev)
 {
        struct bat_priv *bat_priv = netdev_priv(dev);
 

diff --git a/net/batman-adv/bat_debugfs.h b/net/batman-adv/bat_debugfs.h
index d605c6746428a3731d6a694c1b0d1a55997f5650..3b206c811263f3c09b9e6b080bace7b16c87d4c9 100644 (file)
--- a/net/batman-adv/bat_debugfs.h
+++ b/net/batman-adv/bat_debugfs.h
@@ -25,9 +25,9 @@
 
 #define DEBUGFS_BAT_SUBDIR "batman_adv"
 
-void debugfs_init(void);
-void debugfs_destroy(void);
-int debugfs_add_meshif(struct net_device *dev);
-void debugfs_del_meshif(struct net_device *dev);
+void batadv_debugfs_init(void);
+void batadv_debugfs_destroy(void);
+int batadv_debugfs_add_meshif(struct net_device *dev);
+void batadv_debugfs_del_meshif(struct net_device *dev);
 
 #endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 1f064d430a29d2477f90d99948061c11ee3046ab..46a35e1c67caca175a0838e916517552a7a39b86 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -66,7 +66,7 @@ static int __init batman_init(void)
                return -ENOMEM;
 
        bat_socket_init();
-       debugfs_init();
+       batadv_debugfs_init();
 
        register_netdevice_notifier(&hard_if_notifier);
 
@@ -78,7 +78,7 @@ static int __init batman_init(void)
 
 static void __exit batman_exit(void)
 {
-       debugfs_destroy();
+       batadv_debugfs_destroy();
        unregister_netdevice_notifier(&hard_if_notifier);
        hardif_remove_interfaces();
 

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 6e0cbdc48321440651c41f66d53b2b08a32f4da9..ea9d433ad46daac099b42a263bc300605398b3f4 100644 (file)
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -167,12 +167,13 @@ int bat_algo_select(struct bat_priv *bat_priv, char *name);
 int bat_algo_seq_print_text(struct seq_file *seq, void *offset);
 
 #ifdef CONFIG_BATMAN_ADV_DEBUG
-int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) __printf(2, 3);
+int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...)
+__printf(2, 3);
 
 #define bat_dbg(type, bat_priv, fmt, arg...)                   \
        do {                                                    \
                if (atomic_read(&bat_priv->log_level) & type)   \
-                       debug_log(bat_priv, fmt, ## arg);       \
+                       batadv_debug_log(bat_priv, fmt, ## arg);\
        }                                                       \
        while (0)
 #else /* !CONFIG_BATMAN_ADV_DEBUG */

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 304a7ba09e03c3c6be067658764ab04be48450c8..0f0003b00f8c347fcc5e6b1e9734b9f00f664add 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -419,7 +419,7 @@ struct net_device *softif_create(const char *name)
        if (ret < 0)
                goto free_bat_counters;
 
-       ret = debugfs_add_meshif(soft_iface);
+       ret = batadv_debugfs_add_meshif(soft_iface);
        if (ret < 0)
                goto unreg_sysfs;
 
@@ -430,7 +430,7 @@ struct net_device *softif_create(const char *name)
        return soft_iface;
 
 unreg_debugfs:
-       debugfs_del_meshif(soft_iface);
+       batadv_debugfs_del_meshif(soft_iface);
 unreg_sysfs:
        sysfs_del_meshif(soft_iface);
 free_bat_counters:
@@ -447,7 +447,7 @@ out:
 
 void softif_destroy(struct net_device *soft_iface)
 {
-       debugfs_del_meshif(soft_iface);
+       batadv_debugfs_del_meshif(soft_iface);
        sysfs_del_meshif(soft_iface);
        mesh_free(soft_iface);
        unregister_netdevice(soft_iface);