summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSimon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>2011-10-30 16:22:43 +0100
committerSven Eckelmann <sven@narfation.org>2011-11-20 13:08:35 +0100
commit76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 (patch)
tree30b2e7650d62277cfb63dfe8145f4b372b47af4c /net/batman-adv
parent8b7342d673d31e7aa60baae35321c11532275cdb (diff)
downloadblackbird-op-linux-76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1.tar.gz
blackbird-op-linux-76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1.zip
batman-adv: Fix range check for expected packets
The check for new packets in the future used a wrong binary operator, which makes the check expression always true and accepting too many packets. Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/bitarray.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 0be9ff346fa0..9bc63b209b3f 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -155,7 +155,7 @@ int bit_get_packet(void *priv, unsigned long *seq_bits,
/* sequence number is much newer, probably missed a lot of packets */
if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE)
- || (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
+ && (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
bat_dbg(DBG_BATMAN, bat_priv,
"We missed a lot of packets (%i) !\n",
seq_num_diff - 1);
OpenPOWER on IntegriCloud