batman-adv: Prefix main defines with BATADV_

Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index e195b9eed7ee..4a009b550895 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -25,10 +25,10 @@
 /* shift the packet array by n places. */
 static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n)
 {
-        if (n <= 0 || n >= TQ_LOCAL_WINDOW_SIZE)
+        if (n <= 0 || n >= BATADV_TQ_LOCAL_WINDOW_SIZE)
                 return;
 
-        bitmap_shift_left(seq_bits, seq_bits, n, TQ_LOCAL_WINDOW_SIZE);
+        bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE);
 }
 
 
@@ -46,7 +46,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
         /* sequence number is slightly older. We already got a sequence number
          * higher than this one, so we just mark it.
          */
-        if ((seq_num_diff <= 0) && (seq_num_diff > -TQ_LOCAL_WINDOW_SIZE)) {
+        if (seq_num_diff <= 0 && seq_num_diff > -BATADV_TQ_LOCAL_WINDOW_SIZE) {
                 if (set_mark)
                         batadv_set_bit(seq_bits, -seq_num_diff);
                 return 0;
@@ -55,7 +55,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
         /* sequence number is slightly newer, so we shift the window and
          * set the mark if required
          */
-        if ((seq_num_diff > 0) && (seq_num_diff < TQ_LOCAL_WINDOW_SIZE)) {
+        if (seq_num_diff > 0 && seq_num_diff < BATADV_TQ_LOCAL_WINDOW_SIZE) {
                 batadv_bitmap_shift_left(seq_bits, seq_num_diff);
 
                 if (set_mark)
@@ -64,12 +64,12 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
         }
 
         /* sequence number is much newer, probably missed a lot of packets */
-        if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) &&
-            (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
+        if (seq_num_diff >= BATADV_TQ_LOCAL_WINDOW_SIZE &&
+            seq_num_diff < BATADV_EXPECTED_SEQNO_RANGE) {
                 batadv_dbg(DBG_BATMAN, bat_priv,
                            "We missed a lot of packets (%i) !\n",
                            seq_num_diff - 1);
-                bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE);
+                bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
                 if (set_mark)
                         batadv_set_bit(seq_bits, 0);
                 return 1;
@@ -80,13 +80,13 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
          * packet should be dropped without calling this function if the
          * seqno window is protected.
          */
-        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
-            (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
+        if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||
+            seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {
 
                 batadv_dbg(DBG_BATMAN, bat_priv,
                            "Other host probably restarted!\n");
 
-                bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE);
+                bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
                 if (set_mark)
                         batadv_set_bit(seq_bits, 0);