diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-11 20:09:34 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 16:15:23 -0400 |
commit | 7d211efc5087bc8870fa3374da88b4bf8159e79b (patch) | |
tree | 1cd6c7b6543610f7e684ac20988735c7c6d1c8fa /net/batman-adv/bridge_loop_avoidance.c | |
parent | 9039dc7e8a42864744665bf0905f48c2724f6e3e (diff) |
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/bridge_loop_avoidance.c')
-rw-r--r-- | net/batman-adv/bridge_loop_avoidance.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index eb2178951c39..c4b28af69297 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c | |||
@@ -399,7 +399,7 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv, | |||
399 | if (orig_node) { | 399 | if (orig_node) { |
400 | tt_global_del_orig(bat_priv, orig_node, | 400 | tt_global_del_orig(bat_priv, orig_node, |
401 | "became a backbone gateway"); | 401 | "became a backbone gateway"); |
402 | orig_node_free_ref(orig_node); | 402 | batadv_orig_node_free_ref(orig_node); |
403 | } | 403 | } |
404 | return entry; | 404 | return entry; |
405 | } | 405 | } |
@@ -804,7 +804,7 @@ static int check_claim_group(struct bat_priv *bat_priv, | |||
804 | bla_dst_own->group = bla_dst->group; | 804 | bla_dst_own->group = bla_dst->group; |
805 | } | 805 | } |
806 | 806 | ||
807 | orig_node_free_ref(orig_node); | 807 | batadv_orig_node_free_ref(orig_node); |
808 | 808 | ||
809 | return 2; | 809 | return 2; |
810 | } | 810 | } |