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/originator.c | |
| parent | 08adf1512298201a53b88bb0a3d67e0dbbe0ed9b (diff) | |
| download | linux-stable-7cf06bc6ff810178a7fb9f12aaa6b274fc520f6f.tar.gz linux-stable-7cf06bc6ff810178a7fb9f12aaa6b274fc520f6f.tar.bz2 linux-stable-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/originator.c')
| -rw-r--r-- | net/batman-adv/originator.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index cf83c5422e9a..2f921bff84a9 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -361,7 +361,8 @@ static void _purge_orig(struct bat_priv *bat_priv) head, hash_entry) { if (purge_orig_node(bat_priv, orig_node)) { if (orig_node->gw_flags) - gw_node_delete(bat_priv, orig_node); + batadv_gw_node_delete(bat_priv, + orig_node); hlist_del_rcu(node); orig_node_free_ref(orig_node); continue; @@ -374,8 +375,8 @@ static void _purge_orig(struct bat_priv *bat_priv) spin_unlock_bh(list_lock); } - gw_node_purge(bat_priv); - gw_election(bat_priv); + batadv_gw_node_purge(bat_priv); + batadv_gw_election(bat_priv); } static void purge_orig(struct work_struct *work) |