[commits] batman-adv; branch, master, updated. v2011.1.0-155-gfdc8438

postmaster at open-mesh.org postmaster at open-mesh.org
Wed Jun 15 21:02:39 CEST 2011


The following commit has been merged in the master branch:
commit fdc8438e00328eb19cc5d48e181d8f628a5256ee
Author: David Howells <dhowells at redhat.com>
Date:   Wed Jun 15 09:41:36 2011 +0200

    batman-adv: count_real_packets() in batman-adv assumes char is signed
    
    count_real_packets() in batman-adv assumes char is signed, and returns -1
    through it:
    
    net/batman-adv/routing.c: In function 'receive_bat_packet':
    net/batman-adv/routing.c:739: warning: comparison is always false due to limited range of data type
    
    Use int instead.
    
    Signed-off-by: David Howells <dhowells at redhat.com>
    cc: Marek Lindner <lindner_marek at yahoo.de>
    cc: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
    cc: Sven Eckelmann <sven at narfation.org>
    cc: b.a.t.m.a.n at lists.open-mesh.org
    cc: netdev at vger.kernel.org
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/bitarray.c b/bitarray.c
index 700ee4f..3659a25 100644
--- a/bitarray.c
+++ b/bitarray.c
@@ -26,8 +26,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(const unsigned long *seq_bits, uint32_t last_seqno,
-		       uint32_t curr_seqno)
+int get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno,
+		   uint32_t curr_seqno)
 {
 	int32_t diff, word_offset, word_num;
 
diff --git a/bitarray.h b/bitarray.h
index e32eb2d..277c037 100644
--- a/bitarray.h
+++ b/bitarray.h
@@ -26,8 +26,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(const unsigned long *seq_bits, uint32_t last_seqno,
-		       uint32_t curr_seqno);
+int get_bit_status(const 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(unsigned long *seq_bits, int32_t n);
diff --git a/routing.c b/routing.c
index 3f52ceb..dc639db 100644
--- a/routing.c
+++ b/routing.c
@@ -381,7 +381,7 @@ static void update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node,
 			const struct ethhdr *ethhdr,
 			const struct batman_packet *batman_packet,
 			struct hard_iface *if_incoming,
-			const unsigned char *tt_buff, char is_duplicate)
+			const unsigned char *tt_buff, int is_duplicate)
 {
 	struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
 	struct neigh_node *router = NULL;
@@ -548,7 +548,7 @@ static int window_protected(struct bat_priv *bat_priv,
  *  -1 the packet is old and has been received while the seqno window
  *     was protected. Caller should drop it.
  */
-static char count_real_packets(const struct ethhdr *ethhdr,
+static int count_real_packets(const struct ethhdr *ethhdr,
 			       const struct batman_packet *batman_packet,
 			       const struct hard_iface *if_incoming)
 {
@@ -556,7 +556,7 @@ static char count_real_packets(const struct ethhdr *ethhdr,
 	struct orig_node *orig_node;
 	struct neigh_node *tmp_neigh_node;
 	struct hlist_node *node;
-	char is_duplicate = 0;
+	int is_duplicate = 0;
 	int32_t seq_diff;
 	int need_update = 0;
 	int set_mark, ret = -1;
@@ -625,7 +625,7 @@ void receive_bat_packet(const struct ethhdr *ethhdr,
 	char has_directlink_flag;
 	char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
 	char is_broadcast = 0, is_bidirectional, is_single_hop_neigh;
-	char is_duplicate;
+	int is_duplicate;
 	uint32_t if_incoming_seqno;
 
 	/* Silently drop when the batman packet is actually not a

-- 
batman-adv


More information about the commits mailing list