summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.h
diff options
context:
space:
mode:
authorSven Eckelmann2012-05-12 02:09:23 +0200
committerAntonio Quartulli2012-06-20 22:15:14 +0200
commit40a072d777a4f417c0296e06f91297b0f3f2fa36 (patch)
tree1490957336c2873cd3ec5e586927e92bc3e9a17a /net/batman-adv/main.h
parentbatman-adv: Prefix bat_algo non-static functions with batadv_ (diff)
downloadkernel-qcow2-linux-40a072d777a4f417c0296e06f91297b0f3f2fa36.tar.gz
kernel-qcow2-linux-40a072d777a4f417c0296e06f91297b0f3f2fa36.tar.xz
kernel-qcow2-linux-40a072d777a4f417c0296e06f91297b0f3f2fa36.zip
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>
Diffstat (limited to 'net/batman-adv/main.h')
-rw-r--r--net/batman-adv/main.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 6e0cbdc48321..ea9d433ad46d 100644
--- 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 */