batman-adv: Remove extra check in batadv_bit_get_packet (8e7c15d6) · Commits · 戴 / test

batadv_bit_get_packet checks for all common situations before it decides that the new received packet indicates that the host was restarted. This extra condition check at the end of the function is not necessary because this condition is always true. This patch addresses Coverity #712296: Logically dead code Signed-off-by:

Sven Eckelmann <sven@narfation.org> Signed-off-by:

Antonio Quartulli <ordex@autistici.org>

net/batman-adv/bitarray.c

+10 −13

Original line number	Diff line number	Diff line
		@@ -79,10 +79,11 @@ int batadv_bit_get_packet(void priv, unsigned long seq_bits,
		* or the old packet got delayed somewhere in the network. The
		* packet should be dropped without calling this function if the
		* seqno window is protected.
		*
		* seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE
		* or
		* seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE
		*/
		if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE \|\|
		seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
		"Other host probably restarted!\n");

		@@ -92,7 +93,3 @@ int batadv_bit_get_packet(void priv, unsigned long seq_bits,

		return 1;
		}

		/* never reached */
		return 0;
		}

Admin message