提交 8e7c15d6 编写于 作者: S Sven Eckelmann 提交者: Antonio Quartulli

batman-adv: Remove extra check in batadv_bit_get_packet

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: NSven Eckelmann <sven@narfation.org>
Signed-off-by: NAntonio Quartulli <ordex@autistici.org>
上级 36c1d153
...@@ -79,20 +79,17 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, ...@@ -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 * or the old packet got delayed somewhere in the network. The
* packet should be dropped without calling this function if the * packet should be dropped without calling this function if the
* seqno window is protected. * 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 || batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) { "Other host probably restarted!\n");
batadv_dbg(BATADV_DBG_BATMAN, bat_priv, bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
"Other host probably restarted!\n"); if (set_mark)
batadv_set_bit(seq_bits, 0);
bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
if (set_mark)
batadv_set_bit(seq_bits, 0);
return 1;
}
/* never reached */ return 1;
return 0;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册