summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/bitarray.h
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 02:09:25 +0200
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 22:15:16 +0200
commit0f5f9322681887ca221707afafe4216b6db5d22f (patch)
tree93a654d6a5433adedeaee26cd204ad4b338304b1 /net/batman-adv/bitarray.h
parent5853e22c58b318232fd6e15033ccb0852f865c0b (diff)
downloadlinux-0f5f9322681887ca221707afafe4216b6db5d22f.tar.gz
linux-0f5f9322681887ca221707afafe4216b6db5d22f.tar.bz2
linux-0f5f9322681887ca221707afafe4216b6db5d22f.zip
batman-adv: Prefix bitarray 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/bitarray.h')
-rw-r--r--net/batman-adv/bitarray.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index 1835c15cda41..e855ddd37430 100644
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -48,7 +48,7 @@ static inline void bat_set_bit(unsigned long *seq_bits, int32_t n)
/* receive and process one packet, returns 1 if received seq_num is considered
* new, 0 if old */
-int bit_get_packet(void *priv, unsigned long *seq_bits,
- int32_t seq_num_diff, int set_mark);
+int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
+ int32_t seq_num_diff, int set_mark);
#endif /* _NET_BATMAN_ADV_BITARRAY_H_ */