diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-11 20:09:39 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 16:15:29 -0400 |
commit | 08c36d3e8ad1f73d3b0322842363b23f6d203630 (patch) | |
tree | 9190100a886c18956fee193acbd8fd160060bc19 /net/batman-adv/main.c | |
parent | 04b482a21aaf22cf5b327fb6a3fba6fdc8cb3de9 (diff) |
batman-adv: Prefix translation-table 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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index b9531a11b7bf..8d2011b8ed35 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c | |||
@@ -115,11 +115,11 @@ int mesh_init(struct net_device *soft_iface) | |||
115 | if (ret < 0) | 115 | if (ret < 0) |
116 | goto err; | 116 | goto err; |
117 | 117 | ||
118 | ret = tt_init(bat_priv); | 118 | ret = batadv_tt_init(bat_priv); |
119 | if (ret < 0) | 119 | if (ret < 0) |
120 | goto err; | 120 | goto err; |
121 | 121 | ||
122 | tt_local_add(soft_iface, soft_iface->dev_addr, NULL_IFINDEX); | 122 | batadv_tt_local_add(soft_iface, soft_iface->dev_addr, NULL_IFINDEX); |
123 | 123 | ||
124 | ret = vis_init(bat_priv); | 124 | ret = vis_init(bat_priv); |
125 | if (ret < 0) | 125 | if (ret < 0) |
@@ -152,7 +152,7 @@ void mesh_free(struct net_device *soft_iface) | |||
152 | batadv_gw_node_purge(bat_priv); | 152 | batadv_gw_node_purge(bat_priv); |
153 | batadv_originator_free(bat_priv); | 153 | batadv_originator_free(bat_priv); |
154 | 154 | ||
155 | tt_free(bat_priv); | 155 | batadv_tt_free(bat_priv); |
156 | 156 | ||
157 | batadv_bla_free(bat_priv); | 157 | batadv_bla_free(bat_priv); |
158 | 158 | ||