aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 07:38:47 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 16:15:17 -0400
commit08adf1512298201a53b88bb0a3d67e0dbbe0ed9b (patch)
treec0300fbf9717978726becbbdf14f1332178e78cd /net/batman-adv/main.c
parent0f5f9322681887ca221707afafe4216b6db5d22f (diff)
batman-adv: Prefix bridge_loop_avoidance 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 46a35e1c67ca..3e1bb7a1f8b4 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -125,7 +125,7 @@ int mesh_init(struct net_device *soft_iface)
125 if (ret < 0) 125 if (ret < 0)
126 goto err; 126 goto err;
127 127
128 ret = bla_init(bat_priv); 128 ret = batadv_bla_init(bat_priv);
129 if (ret < 0) 129 if (ret < 0)
130 goto err; 130 goto err;
131 131
@@ -154,7 +154,7 @@ void mesh_free(struct net_device *soft_iface)
154 154
155 tt_free(bat_priv); 155 tt_free(bat_priv);
156 156
157 bla_free(bat_priv); 157 batadv_bla_free(bat_priv);
158 158
159 free_percpu(bat_priv->bat_counters); 159 free_percpu(bat_priv->bat_counters);
160 160