diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 02:09:29 +0200 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 22:15:18 +0200 |
| commit | 7cf06bc6ff810178a7fb9f12aaa6b274fc520f6f (patch) | |
| tree | d2155e204af6153174f9a7f37596c21e04c65ddb /net/batman-adv/bat_iv_ogm.c | |
| parent | batman-adv: Prefix bridge_loop_avoidance non-static functions with batadv_ (diff) | |
| download | linux-7cf06bc6ff810178a7fb9f12aaa6b274fc520f6f.tar.xz linux-7cf06bc6ff810178a7fb9f12aaa6b274fc520f6f.zip | |
batman-adv: Prefix gateway-client 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/bat_iv_ogm.c')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 53bce95e5f33..defcac1184c4 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -729,8 +729,8 @@ update_tt: ntohs(batman_ogm_packet->tt_crc)); if (orig_node->gw_flags != batman_ogm_packet->gw_flags) - gw_node_update(bat_priv, orig_node, - batman_ogm_packet->gw_flags); + batadv_gw_node_update(bat_priv, orig_node, + batman_ogm_packet->gw_flags); orig_node->gw_flags = batman_ogm_packet->gw_flags; @@ -738,7 +738,7 @@ update_tt: if ((orig_node->gw_flags) && (atomic_read(&bat_priv->gw_mode) == GW_MODE_CLIENT) && (atomic_read(&bat_priv->gw_sel_class) > 2)) - gw_check_election(bat_priv, orig_node); + batadv_gw_check_election(bat_priv, orig_node); goto out; |