From patchwork Sat Nov 26 14:26:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 127810 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 09B65B702E for ; Sun, 27 Nov 2011 01:30:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752587Ab1KZOax (ORCPT ); Sat, 26 Nov 2011 09:30:53 -0500 Received: from nm16.bullet.mail.ukl.yahoo.com ([217.146.183.190]:37395 "HELO nm16.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751858Ab1KZOaw (ORCPT ); Sat, 26 Nov 2011 09:30:52 -0500 Received: from [217.146.183.181] by nm16.bullet.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:30:51 -0000 Received: from [77.238.184.77] by tm12.bullet.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:30:51 -0000 Received: from [127.0.0.1] by smtp146.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:30:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1322317851; bh=Ad3xvXLnNZAbaaRWYivNYVEHQGc3YmOYQ0guZ5X3+xU=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=54Q02D+XkV3OY32Cbmd/N5PIt3fbV47uTsWV8oecZEimEga4ZJ0Aa/+w9IWqsV+6RUw7ThU2EskB4mtBgqy0tJM/hQFyTRhW/KEeoig+PKysYoEisTDsER5yfB7dD3dmR9Uz6ZckwERSbg4q3ZUfqmcinZc++lBGghmAWA9OMHI= X-Yahoo-Newman-Id: 196586.98337.bm@smtp146.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: _VkDQwAVM1m2e6cvoq9pe.sSLms0hdbGoyn9kPjiNOQnv83 o2dNEGkM_JZ3Hp_DNLpPvpiguvSbLjHDuDwCEODaT7ETHl6QD0KGVAktwIUl h5MT149mmaAEbsq1OreRANZ4IufT0yf2QzQWR3lQCdbnAs8JS08ZWJUtNNnz duPLjs_HoGahrwVzft_FStGdZI2l9dzP.wAXBFV4JfZSADZd96XAwxnC9La. rJIQ.veCiiHyh8hYVf_WXKAd3uNxL5X6pjkx6kQZYkyXHTGpQMdtSj1IYRfA FuwmK6E7oZtUQOTYYcwLGK1zWjcYzAklN9PdMQTRQwGn7ipffndfzpL4Cac0 Ocxyrv2hYHak9UdKl6Rb3fppDZfDIr9ZppCMFJmUjY0QOYuGOi_cdXCU- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp146.mail.ukl.yahoo.com with SMTP; 26 Nov 2011 14:30:48 +0000 GMT From: Marek Lindner To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Simon Wunderlich , Simon Wunderlich , Sven Eckelmann Subject: [PATCH 10/10] batman-adv: Fix range check for expected packets Date: Sat, 26 Nov 2011 22:26:52 +0800 Message-Id: <1322317612-7770-11-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1322317612-7770-1-git-send-email-lindner_marek@yahoo.de> References: <1322317612-7770-1-git-send-email-lindner_marek@yahoo.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Simon Wunderlich 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 Signed-off-by: Simon Wunderlich Signed-off-by: Sven Eckelmann --- net/batman-adv/bitarray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index 0be9ff3..9bc63b2 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);