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>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 94859d45ed6efedad97e0ef37c9e10223b2de29b..ad641e8d3c0f0654a144db73e84557b22c784d54 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -901,9 +901,9 @@ static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
        hlist_for_each_entry_rcu(tmp_neigh_node, node,
                                 &orig_node->neigh_list, list) {
 
-               is_duplicate |= bat_test_bit(tmp_neigh_node->real_bits,
-                                            orig_node->last_real_seqno,
-                                            seqno);
+               is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits,
+                                               orig_node->last_real_seqno,
+                                               seqno);
 
                if (compare_eth(tmp_neigh_node->addr, ethhdr->h_source) &&
                    (tmp_neigh_node->if_incoming == if_incoming))
@@ -1037,6 +1037,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
        if (is_my_orig) {
                unsigned long *word;
                int offset;
+               int32_t bit_pos;
 
                orig_neigh_node = batadv_get_orig_node(bat_priv,
                                                       ethhdr->h_source);
@@ -1054,9 +1055,9 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
 
                        spin_lock_bh(&orig_neigh_node->ogm_cnt_lock);
                        word = &(orig_neigh_node->bcast_own[offset]);
-                       bat_set_bit(word,
-                                   if_incoming_seqno -
-                                       ntohl(batman_ogm_packet->seqno) - 2);
+                       bit_pos = if_incoming_seqno - 2;
+                       bit_pos -= ntohl(batman_ogm_packet->seqno);
+                       batadv_set_bit(word, bit_pos);
                        orig_neigh_node->bcast_own_sum[if_incoming->if_num] =
                                bitmap_weight(word, TQ_LOCAL_WINDOW_SIZE);
                        spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock);

diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 838abbc73c6c4043ceaa9be26b7d9bcb8700c9ef..7a7065cc88cd5edd093040617857ccbc9288f2f0 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,7 +59,7 @@ 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;
        }
 
@@ -71,7 +71,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
                        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;
        }
 
@@ -88,7 +88,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
 
                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;
        }

diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index 8ab542632343d094cfd3cf515e6b04225fd9d231..7954ba81cece833a7d9748a6b506527fe77936e7 100644 (file)
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -23,8 +23,8 @@
 /* returns true if the corresponding bit in the given seq_bits indicates true
  * and curr_seqno is within range of last_seqno
  */
-static inline int bat_test_bit(const unsigned long *seq_bits,
-                              uint32_t last_seqno, uint32_t curr_seqno)
+static inline int batadv_test_bit(const unsigned long *seq_bits,
+                                 uint32_t last_seqno, uint32_t curr_seqno)
 {
        int32_t diff;
 
@@ -36,7 +36,7 @@ static inline int bat_test_bit(const unsigned long *seq_bits,
 }
 
 /* turn corresponding bit on, so we can remember that we got the packet */
-static inline void bat_set_bit(unsigned long *seq_bits, int32_t n)
+static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n)
 {
        /* if too old, just drop it */
        if (n < 0 || n >= TQ_LOCAL_WINDOW_SIZE)

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 79f63cf11be4b83c324101a8f6d0626bb73c4f77..9c90cceda17d6bf7d18108422a5ed84a0c27fc9c 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -1086,8 +1086,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
        spin_lock_bh(&orig_node->bcast_seqno_lock);
 
        /* check whether the packet is a duplicate */
-       if (bat_test_bit(orig_node->bcast_bits, orig_node->last_bcast_seqno,
-                        ntohl(bcast_packet->seqno)))
+       if (batadv_test_bit(orig_node->bcast_bits, orig_node->last_bcast_seqno,
+                           ntohl(bcast_packet->seqno)))
                goto spin_unlock;
 
        seq_diff = ntohl(bcast_packet->seqno) - orig_node->last_bcast_seqno;