diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 07:48:53 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-24 12:41:40 -0400 |
commit | 9b4a1159dff76f938aa64f7000621552e4d9ad18 (patch) | |
tree | f1e99a20dcb439299b83a6e2c09bb0aa3edb398c /net/batman-adv/bitarray.c | |
parent | 9e466250ede375482a9a65ca60765d24303099e9 (diff) |
batman-adv: Prefix bitarray static inline functions with batadv_
All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/bitarray.c')
-rw-r--r-- | net/batman-adv/bitarray.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index 838abbc73c6c..7a7065cc88cd 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c | |||
@@ -48,7 +48,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, | |||
48 | */ | 48 | */ |
49 | if ((seq_num_diff <= 0) && (seq_num_diff > -TQ_LOCAL_WINDOW_SIZE)) { | 49 | if ((seq_num_diff <= 0) && (seq_num_diff > -TQ_LOCAL_WINDOW_SIZE)) { |
50 | if (set_mark) | 50 | if (set_mark) |
51 | bat_set_bit(seq_bits, -seq_num_diff); | 51 | batadv_set_bit(seq_bits, -seq_num_diff); |
52 | return 0; | 52 | return 0; |
53 | } | 53 | } |
54 | 54 | ||
@@ -59,7 +59,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, | |||
59 | batadv_bitmap_shift_left(seq_bits, seq_num_diff); | 59 | batadv_bitmap_shift_left(seq_bits, seq_num_diff); |
60 | 60 | ||
61 | if (set_mark) | 61 | if (set_mark) |
62 | bat_set_bit(seq_bits, 0); | 62 | batadv_set_bit(seq_bits, 0); |
63 | return 1; | 63 | return 1; |
64 | } | 64 | } |
65 | 65 | ||
@@ -71,7 +71,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, | |||
71 | seq_num_diff - 1); | 71 | seq_num_diff - 1); |
72 | bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE); | 72 | bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE); |
73 | if (set_mark) | 73 | if (set_mark) |
74 | bat_set_bit(seq_bits, 0); | 74 | batadv_set_bit(seq_bits, 0); |
75 | return 1; | 75 | return 1; |
76 | } | 76 | } |
77 | 77 | ||
@@ -88,7 +88,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, | |||
88 | 88 | ||
89 | bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE); | 89 | bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE); |
90 | if (set_mark) | 90 | if (set_mark) |
91 | bat_set_bit(seq_bits, 0); | 91 | batadv_set_bit(seq_bits, 0); |
92 | 92 | ||
93 | return 1; | 93 | return 1; |
94 | } | 94 | } |