aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/translation-table.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/translation-table.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/translation-table.c')
-rw-r--r--net/batman-adv/translation-table.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index a1a51cc9d88e..bb8557ea30f1 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1674,7 +1674,7 @@ bool send_tt_response(struct bat_priv *bat_priv,
1674{ 1674{
1675 if (is_my_mac(tt_request->dst)) { 1675 if (is_my_mac(tt_request->dst)) {
1676 /* don't answer backbone gws! */ 1676 /* don't answer backbone gws! */
1677 if (bla_is_backbone_gw_orig(bat_priv, tt_request->src)) 1677 if (batadv_bla_is_backbone_gw_orig(bat_priv, tt_request->src))
1678 return true; 1678 return true;
1679 1679
1680 return send_my_tt_response(bat_priv, tt_request); 1680 return send_my_tt_response(bat_priv, tt_request);
@@ -1786,7 +1786,7 @@ void handle_tt_response(struct bat_priv *bat_priv,
1786 (tt_response->flags & TT_FULL_TABLE ? 'F' : '.')); 1786 (tt_response->flags & TT_FULL_TABLE ? 'F' : '.'));
1787 1787
1788 /* we should have never asked a backbone gw */ 1788 /* we should have never asked a backbone gw */
1789 if (bla_is_backbone_gw_orig(bat_priv, tt_response->src)) 1789 if (batadv_bla_is_backbone_gw_orig(bat_priv, tt_response->src))
1790 goto out; 1790 goto out;
1791 1791
1792 orig_node = orig_hash_find(bat_priv, tt_response->src); 1792 orig_node = orig_hash_find(bat_priv, tt_response->src);
@@ -2163,7 +2163,7 @@ void tt_update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node,
2163 bool full_table = true; 2163 bool full_table = true;
2164 2164
2165 /* don't care about a backbone gateways updates. */ 2165 /* don't care about a backbone gateways updates. */
2166 if (bla_is_backbone_gw_orig(bat_priv, orig_node->orig)) 2166 if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig))
2167 return; 2167 return;
2168 2168
2169 /* orig table not initialised AND first diff is in the OGM OR the ttvn 2169 /* orig table not initialised AND first diff is in the OGM OR the ttvn