The following commit has been merged in the master branch: commit a561da2f5006d5fee0e4462aec7b612fb422e197 Author: Sven Eckelmann sven@narfation.org Date: Sat May 12 02:09:22 2012 +0200

batman-adv: Prefix bat_algo 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

diff --git a/bat_algo.h b/bat_algo.h index 9852a68..a14336a 100644 --- a/bat_algo.h +++ b/bat_algo.h @@ -22,6 +22,6 @@ #ifndef _NET_BATMAN_ADV_BAT_ALGO_H_ #define _NET_BATMAN_ADV_BAT_ALGO_H_

-int bat_iv_init(void); +int batadv_iv_init(void);

#endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */ diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index f724d44..470fe01 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1247,7 +1247,7 @@ static struct bat_algo_ops batman_iv __read_mostly = { .bat_ogm_emit = bat_iv_ogm_emit, };

-int __init bat_iv_init(void) +int __init batadv_iv_init(void) { int ret;

diff --git a/main.c b/main.c index 805373f..f272ed4 100644 --- a/main.c +++ b/main.c @@ -56,7 +56,7 @@ static int __init batman_init(void)

recv_handler_init();

- bat_iv_init(); + batadv_iv_init();

/* the name should not be longer than 10 chars - see * http://lwn.net/Articles/23634/ */