summaryrefslogtreecommitdiff
path: root/net/batman-adv/main.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 02:09:33 +0200
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 22:15:22 +0200
commit9039dc7e8a42864744665bf0905f48c2724f6e3e (patch)
treec59dbebe6df45722abb14d06f59be48fb09f2ed8 /net/batman-adv/main.c
parent1a8eaf0733ca754533a03d6cfa4463def2b81ce3 (diff)
downloadlinux-3.10-9039dc7e8a42864744665bf0905f48c2724f6e3e.tar.gz
linux-3.10-9039dc7e8a42864744665bf0905f48c2724f6e3e.tar.bz2
linux-3.10-9039dc7e8a42864744665bf0905f48c2724f6e3e.zip
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>
Diffstat (limited to 'net/batman-adv/main.c')
-rw-r--r--net/batman-adv/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 8e408361252..84dbda50aa9 100644
--- 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);