Merge branch 'master' into tk71

[mv-sheeva.git] / net / batman-adv / bitarray.h

diff --git a/drivers/staging/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
similarity index 75%
rename from drivers/staging/batman-adv/bitarray.h
rename to net/batman-adv/bitarray.h
index 01897d6962d03655813e978f32ee5764e9b873f9..ac54017601b1b4bb5a78369f5a00ba53e12ae365 100644 (file)
--- a/drivers/staging/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -22,25 +22,23 @@
 #ifndef _NET_BATMAN_ADV_BITARRAY_H_
 #define _NET_BATMAN_ADV_BITARRAY_H_
 
-/* you should choose something big, if you don't want to waste cpu */
-#define TYPE_OF_WORD unsigned long
-#define WORD_BIT_SIZE (sizeof(TYPE_OF_WORD) * 8)
+#define WORD_BIT_SIZE (sizeof(unsigned long) * 8)
 
 /* returns true if the corresponding bit in the given seq_bits indicates true
  * and curr_seqno is within range of last_seqno */
-uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno,
+uint8_t get_bit_status(unsigned long *seq_bits, uint32_t last_seqno,
                                           uint32_t curr_seqno);
 
 /* turn corresponding bit on, so we can remember that we got the packet */
-void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n);
+void bit_mark(unsigned long *seq_bits, int32_t n);
 
 
 /* receive and process one packet, returns 1 if received seq_num is considered
  * new, 0 if old  */
-char bit_get_packet(TYPE_OF_WORD *seq_bits, int32_t seq_num_diff,
-                                       int8_t set_mark);
+char bit_get_packet(void *priv, unsigned long *seq_bits,
+                   int32_t seq_num_diff, int8_t set_mark);
 
 /* count the hamming weight, how many good packets did we receive? */
-int  bit_packet_count(TYPE_OF_WORD *seq_bits);
+int  bit_packet_count(unsigned long *seq_bits);
 
 #endif /* _NET_BATMAN_ADV_BITARRAY_H_ */