Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[firefly-linux-kernel-4.4.55.git] / net / batman-adv / bitarray.h

diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index 7954ba81cece833a7d9748a6b506527fe77936e7..a081ce1c05140d43473dbc02518bfc51f913f6eb 100644 (file)
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -29,7 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits,
        int32_t diff;
 
        diff = last_seqno - curr_seqno;
-       if (diff < 0 || diff >= TQ_LOCAL_WINDOW_SIZE)
+       if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE)
                return 0;
        else
                return  test_bit(diff, seq_bits);
@@ -39,7 +39,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits,
 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)
+       if (n < 0 || n >= BATADV_TQ_LOCAL_WINDOW_SIZE)
                return;
 
        set_bit(n, seq_bits); /* turn the position on */