summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 02:09:34 +0200
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 22:15:23 +0200
commit7d211efc5087bc8870fa3374da88b4bf8159e79b (patch)
tree1cd6c7b6543610f7e684ac20988735c7c6d1c8fa /net/batman-adv/main.c
parentbatman-adv: Prefix icmp-socket non-static functions with batadv_ (diff)
downloadlinux-7d211efc5087bc8870fa3374da88b4bf8159e79b.tar.xz
linux-7d211efc5087bc8870fa3374da88b4bf8159e79b.zip
batman-adv: Prefix originator 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 84dbda50aa90..eba5d2899b25 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -111,7 +111,7 @@ int mesh_init(struct net_device *soft_iface)
INIT_LIST_HEAD(&bat_priv->tt_req_list);
INIT_LIST_HEAD(&bat_priv->tt_roam_list);
- ret = originator_init(bat_priv);
+ ret = batadv_originator_init(bat_priv);
if (ret < 0)
goto err;
@@ -150,7 +150,7 @@ void mesh_free(struct net_device *soft_iface)
vis_quit(bat_priv);
batadv_gw_node_purge(bat_priv);
- originator_free(bat_priv);
+ batadv_originator_free(bat_priv);
tt_free(bat_priv);