summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.c
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.c
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.c')
-rw-r--r--net/batman-adv/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 1f064d430a29..46a35e1c67ca 100644
--- 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();