---

yaml --- r: 219746 b: refs/heads/master c: 8bb22a3 h: refs/heads/master v: v3
git-mirror · Sep 5, 2010 · 1e97c05 · 1e97c05
1 parent 3ff6a62
commit 1e97c05
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 556c83ece8e8a897d7cad23315407ecd1a195fce
+refs/heads/master: 8bb22a38d6083d751075829e84421b139dabb460
diff --git a/trunk/drivers/staging/batman-adv/TODO b/trunk/drivers/staging/batman-adv/TODO
@@ -1,4 +1,3 @@
- * Use hweight* for hamming weight calculation
  * Save/cache packets direktly as skb instead of using a normal memory region
    and copying it in a skb using send_raw_packet and similar functions
  * Request a new review

diff --git a/trunk/drivers/staging/batman-adv/bitarray.c b/trunk/drivers/staging/batman-adv/bitarray.c
@@ -22,6 +22,8 @@
 #include "main.h"
 #include "bitarray.h"
 
+#include <linux/bitops.h>
+
 /* 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,
@@ -187,21 +189,14 @@ char bit_get_packet(TYPE_OF_WORD *seq_bits, int32_t seq_num_diff,
 }
 
 /* count the hamming weight, how many good packets did we receive? just count
- * the 1's. The inner loop uses the Kernighan algorithm, see
- * http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan
+ * the 1's.
  */
 int bit_packet_count(TYPE_OF_WORD *seq_bits)
 {
 	int i, hamming = 0;
-	TYPE_OF_WORD word;
 
-	for (i = 0; i < NUM_WORDS; i++) {
-		word = seq_bits[i];
+	for (i = 0; i < NUM_WORDS; i++)
+		hamming += hweight_long(seq_bits[i]);
 
-		while (word) {
-			word &= word-1;
-			hamming++;
-		}
-	}
 	return hamming;
 }
diff --git a/trunk/drivers/staging/batman-adv/bitarray.h b/trunk/drivers/staging/batman-adv/bitarray.h
@@ -22,7 +22,8 @@
 #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 */
+/* you should choose something big, if you don't want to waste cpu
+ * and keep the type in sync with bit_packet_count */
 #define TYPE_OF_WORD unsigned long
 #define WORD_BIT_SIZE (sizeof(TYPE_OF_WORD) * 8)