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 99ed9917ff0deba79710cda243f33116886e878d..e195b9eed7ee7441eee05696f8ecb0ee8e6de9b7 100644 (file)
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -46,52 +44,51 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
        struct bat_priv *bat_priv = priv;
 
        /* sequence number is slightly older. We already got a sequence number
-        * higher than this one, so we just mark it. */
-
+        * higher than this one, so we just mark it.
+        */
        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;
        }
 
        /* sequence number is slightly newer, so we shift the window and
-        * set the mark if required */
-
+        * set the mark if required
+        */
        if ((seq_num_diff > 0) && (seq_num_diff < TQ_LOCAL_WINDOW_SIZE)) {
                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;
        }
 
        /* received a much older packet. The other host either restarted
         * or the old packet got delayed somewhere in the network. The
         * packet should be dropped without calling this function if the
-        * seqno window is protected. */
-
+        * seqno window is protected.
+        */
        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;
        }