diff mbox

[2/4] batman-adv: refactor window_protected to avoid unnecessary return statement

Message ID 1331969315-27535-2-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Commit f5ca81fd9886d4a2c330ced7f9d23fd41c5e847c
Headers

Commit Message

Marek Lindner March 17, 2012, 7:28 a.m. UTC 
  Reported-by: David Laight <David.Laight@aculab.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 routing.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

Comments

Marek Lindner March 20, 2012, 1:07 p.m. UTC | #1 
On Saturday, March 17, 2012 08:28:33 Marek Lindner wrote:
> Reported-by: David Laight <David.Laight@aculab.com>
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
> ---
>  routing.c |   15 ++++++---------
>  1 files changed, 6 insertions(+), 9 deletions(-)

Applied in revision f5ca81f.

Regards,
Marek
diff mbox

Patch

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;
 }