Skip to content

Commit

Permalink
batman-adv: Remove extra check in batadv_bit_get_packet
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sven Eckelmann authored and Antonio Quartulli committed Oct 29, 2012
1 parent 36c1d15 commit 8e7c15d
Showing 1 changed file with 10 additions and 13 deletions.
23 changes: 10 additions & 13 deletions net/batman-adv/bitarray.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,17 @@ 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");

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

bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
if (set_mark)
batadv_set_bit(seq_bits, 0);

return 1;
}
bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
if (set_mark)
batadv_set_bit(seq_bits, 0);

/* never reached */
return 0;
return 1;
}

0 comments on commit 8e7c15d

Please sign in to comment.