From patchwork Sat Mar 17 07:28:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1604 Return-Path: Received: from nm20-vm0.bullet.mail.ukl.yahoo.com (nm20-vm0.bullet.mail.ukl.yahoo.com [217.146.183.115]) by open-mesh.org (Postfix) with SMTP id 0051E6007A0 for ; Sat, 17 Mar 2012 08:29:25 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.215] by nm20.bullet.mail.ukl.yahoo.com with NNFMP; 17 Mar 2012 07:29:25 -0000 Received: from [217.146.183.124] by tm8.bullet.mail.ukl.yahoo.com with NNFMP; 17 Mar 2012 07:29:25 -0000 Received: from [127.0.0.1] by smtp101.mail.ukl.yahoo.com with NNFMP; 17 Mar 2012 07:29:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1331969365; bh=+J6lcHlpA2fdJBjTNr/LbR6t4P6CFsZbO+rfmju1sd0=; 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=DrDFFu0RU8AB8C0V2lw1DJQkug2Jdyx5Av7hXrBAYuUT1T45J1svOV+2pFz1fev62CbbKBs4VwBdTocEURIP1lthLDrfwi/I8Lihg++RJO5Q75rQdPGldmJJ87NkVf21L7JK0cs3XOO4i1WmuHe4zmXsgFsOuRWCWHFC6awRXLk= X-Yahoo-Newman-Id: 773990.26262.bm@smtp101.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: .FUzmwAVM1l5f5DkEmEbo_07M1WlMCKv5jkVcXNwcbLjfgN .3GbMaVt_9LhlOFjJtqhuAAB4xE5uo.T3RGUyHj7zXejjfPOilzxCGc0ac03 XEfBB2BsLXnXAf_ttK9JWuB66RZI6iaE2rtyoi_nARRy8DmF2qGP3d03YcRe Kij6Euc4JLJ9fgbLdXP1Yc8IgdS_Cj21vcJYVCUuKsWHty2eb_XNt1H4_Zhu MeV50E1Ql.gTyN7UXBJnf6xkOw4O4LUD1AVd8FL6xkA6__JNIoOWnd9d49MC Tm690wnHUd86lBxjeYgQKWc67AyX.y1pNCm74mxjK7l32aDXdkQUjhMCJsqP .dw7PZMogvRQP_os8I9.iThLVwRuUguNrMD9EUcL9yInzvJe54AVNNTSgBD1 FaC_WxdvK3raD7OHxkVqOz_WECwsCGSgvXTxT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@59.152.213.162 with plain) by smtp101.mail.ukl.yahoo.com with SMTP; 17 Mar 2012 00:29:24 -0700 PDT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 17 Mar 2012 15:28:33 +0800 Message-Id: <1331969315-27535-2-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1331969315-27535-1-git-send-email-lindner_marek@yahoo.de> References: <1331969315-27535-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 2/4] batman-adv: refactor window_protected to avoid unnecessary return statement X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2012 07:29:26 -0000 Reported-by: David Laight Signed-off-by: Marek Lindner --- routing.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/routing.c b/routing.c index 962a315..73aa20e 100644 --- a/routing.c +++ b/routing.c @@ -234,17 +234,14 @@ int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, { if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { - if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) { - - *last_reset = jiffies; - bat_dbg(DBG_BATMAN, bat_priv, - "old packet received, start protection\n"); - - return 0; - } else { + if (!has_timed_out(*last_reset, RESET_PROTECTION_MS)) return 1; - } + + *last_reset = jiffies; + bat_dbg(DBG_BATMAN, bat_priv, + "old packet received, start protection\n"); } + return 0; }