batman-adv: Prefix main static inline functions with batadv_

[karo-tx-linux.git] / net / batman-adv / bitarray.c

diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 838abbc73c6c4043ceaa9be26b7d9bcb8700c9ef..e195b9eed7ee7441eee05696f8ecb0ee8e6de9b7 100644 (file)
--- 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,
         */
        if ((seq_num_diff <= 0) && (seq_num_diff > -TQ_LOCAL_WINDOW_SIZE)) {
                if (set_mark)
-                       bat_set_bit(seq_bits, -seq_num_diff);
+                       batadv_set_bit(seq_bits, -seq_num_diff);
                return 0;
        }
 
@@ -59,19 +59,19 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
                batadv_bitmap_shift_left(seq_bits, seq_num_diff);
 
                if (set_mark)
-                       bat_set_bit(seq_bits, 0);
+                       batadv_set_bit(seq_bits, 0);
                return 1;
        }
 
        /* 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)) {
-               bat_dbg(DBG_BATMAN, bat_priv,
-                       "We missed a lot of packets (%i) !\n",
-                       seq_num_diff - 1);
+               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);
                if (set_mark)
-                       bat_set_bit(seq_bits, 0);
+                       batadv_set_bit(seq_bits, 0);
                return 1;
        }
 
@@ -83,12 +83,12 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
            (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
 
-               bat_dbg(DBG_BATMAN, bat_priv,
-                       "Other host probably restarted!\n");
+               batadv_dbg(DBG_BATMAN, bat_priv,
+                          "Other host probably restarted!\n");
 
                bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE);
                if (set_mark)
-                       bat_set_bit(seq_bits, 0);
+                       batadv_set_bit(seq_bits, 0);
 
                return 1;
        }