Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2c44a53 authored by David Howells's avatar David Howells Committed by Sven Eckelmann
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
[sven@narfation.org: Rebase on top of current version]
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent db69ecfc

net/batman-adv/bitarray.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 




/* returns true if the corresponding bit in the given seq_bits indicates true

/* returns true if the corresponding bit in the given seq_bits indicates true

 * and curr_seqno is within range of last_seqno */

 * and curr_seqno is within range of last_seqno */

uint8_t get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno,

int get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno,

		   uint32_t curr_seqno)

		   uint32_t curr_seqno)

{

{

	int32_t diff, word_offset, word_num;

	int32_t diff, word_offset, word_num;

net/batman-adv/bitarray.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 




/* returns true if the corresponding bit in the given seq_bits indicates true

/* returns true if the corresponding bit in the given seq_bits indicates true

 * and curr_seqno is within range of last_seqno */

 * and curr_seqno is within range of last_seqno */

uint8_t get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno,

int get_bit_status(const unsigned long *seq_bits, uint32_t last_seqno,

		   uint32_t curr_seqno);

		   uint32_t curr_seqno);





/* turn corresponding bit on, so we can remember that we got the packet */

/* turn corresponding bit on, so we can remember that we got the packet */

net/batman-adv/routing.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -361,7 +361,7 @@ static void update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, 
			const struct batman_packet *batman_packet,

			const struct batman_packet *batman_packet,

			struct hard_iface *if_incoming,

			struct hard_iface *if_incoming,

			const unsigned char *tt_buff, int tt_buff_len,

			const unsigned char *tt_buff, int tt_buff_len,

			char is_duplicate)

			int is_duplicate)

{

{

	struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;

	struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;

	struct neigh_node *router = NULL;

	struct neigh_node *router = NULL;
@@ -528,7 +528,7 @@ static int window_protected(struct bat_priv *bat_priv, 
 *  -1 the packet is old and has been received while the seqno window

 *  -1 the packet is old and has been received while the seqno window

 *     was protected. Caller should drop it.

 *     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 batman_packet *batman_packet,

			       const struct hard_iface *if_incoming)

			       const struct hard_iface *if_incoming)

{

{
@@ -536,7 +536,7 @@ static char count_real_packets(const struct ethhdr *ethhdr, 
	struct orig_node *orig_node;

	struct orig_node *orig_node;

	struct neigh_node *tmp_neigh_node;

	struct neigh_node *tmp_neigh_node;

	struct hlist_node *node;

	struct hlist_node *node;

	char is_duplicate = 0;

	int is_duplicate = 0;

	int32_t seq_diff;

	int32_t seq_diff;

	int need_update = 0;

	int need_update = 0;

	int set_mark, ret = -1;

	int set_mark, ret = -1;
@@ -605,7 +605,7 @@ void receive_bat_packet(const struct ethhdr *ethhdr, 
	char has_directlink_flag;

	char has_directlink_flag;

	char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;

	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_broadcast = 0, is_bidirectional, is_single_hop_neigh;

	char is_duplicate;

	int is_duplicate;

	uint32_t if_incoming_seqno;

	uint32_t if_incoming_seqno;





	/* Silently drop when the batman packet is actually not a

	/* Silently drop when the batman packet is actually not a