diff options
| author | Sven Eckelmann | 2012-05-12 13:38:47 +0200 |
|---|---|---|
| committer | Antonio Quartulli | 2012-06-20 22:15:17 +0200 |
| commit | 08adf1512298201a53b88bb0a3d67e0dbbe0ed9b (patch) | |
| tree | c0300fbf9717978726becbbdf14f1332178e78cd /net/batman-adv/main.c | |
| parent | batman-adv: Prefix bitarray non-static functions with batadv_ (diff) | |
| download | kernel-qcow2-linux-08adf1512298201a53b88bb0a3d67e0dbbe0ed9b.tar.gz kernel-qcow2-linux-08adf1512298201a53b88bb0a3d67e0dbbe0ed9b.tar.xz kernel-qcow2-linux-08adf1512298201a53b88bb0a3d67e0dbbe0ed9b.zip | |
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/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 46a35e1c67ca..3e1bb7a1f8b4 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -125,7 +125,7 @@ int mesh_init(struct net_device *soft_iface) if (ret < 0) goto err; - ret = bla_init(bat_priv); + ret = batadv_bla_init(bat_priv); if (ret < 0) goto err; @@ -154,7 +154,7 @@ void mesh_free(struct net_device *soft_iface) tt_free(bat_priv); - bla_free(bat_priv); + batadv_bla_free(bat_priv); free_percpu(bat_priv->bat_counters); |