diff options
| author | Sven Eckelmann | 2012-05-12 02:09:25 +0200 |
|---|---|---|
| committer | Antonio Quartulli | 2012-06-20 22:15:16 +0200 |
| commit | 0f5f9322681887ca221707afafe4216b6db5d22f (patch) | |
| tree | 93a654d6a5433adedeaee26cd204ad4b338304b1 /net/batman-adv/routing.c | |
| parent | batman-adv: Prefix bat_sysfs non-static functions with batadv_ (diff) | |
| download | kernel-qcow2-linux-0f5f9322681887ca221707afafe4216b6db5d22f.tar.gz kernel-qcow2-linux-0f5f9322681887ca221707afafe4216b6db5d22f.tar.xz kernel-qcow2-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/routing.c')
| -rw-r--r-- | net/batman-adv/routing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 9cfd23c6d64a..e573c32a619d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -54,7 +54,7 @@ void slide_own_bcast_window(struct hard_iface *hard_iface) word_index = hard_iface->if_num * NUM_WORDS; word = &(orig_node->bcast_own[word_index]); - bit_get_packet(bat_priv, word, 1, 0); + batadv_bit_get_packet(bat_priv, word, 1, 0); orig_node->bcast_own_sum[hard_iface->if_num] = bitmap_weight(word, TQ_LOCAL_WINDOW_SIZE); spin_unlock_bh(&orig_node->ogm_cnt_lock); @@ -1083,7 +1083,7 @@ int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if) /* mark broadcast in flood history, update window position * if required. */ - if (bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1)) + if (batadv_bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1)) orig_node->last_bcast_seqno = ntohl(bcast_packet->seqno); spin_unlock_bh(&orig_node->bcast_seqno_lock); |