Commit 81c524f7 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

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: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent 41063e9d

net/batman-adv/bat_algo.h

+1 −1
Original line number Diff line number Diff line
@@ -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_ */

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -1248,7 +1248,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;

net/batman-adv/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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/ */