From 88de1c481fa64d31b91a07bfbe6fd5cba392cf38 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Mon, 20 Aug 2012 10:26:47 +0200
Subject: [PATCH] --- yaml --- r: 340530 b: refs/heads/master c:
 8e7c15d6b5468f0dcdd887db1e5df88e629c00d6 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/net/batman-adv/bitarray.c | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 12f735719a8d..33c39d4e518b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36c1d1531130dcfadf845419fd15735b9b4c004f
+refs/heads/master: 8e7c15d6b5468f0dcdd887db1e5df88e629c00d6
diff --git a/trunk/net/batman-adv/bitarray.c b/trunk/net/batman-adv/bitarray.c
index aea174cdbfbd..5453b17d8df2 100644
--- a/trunk/net/batman-adv/bitarray.c
+++ b/trunk/net/batman-adv/bitarray.c
@@ -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
 	 * packet should be dropped without calling this function if the
 	 * 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 ||
-	    seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {
+	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+		   "Other host probably restarted!\n");
 
-		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-			   "Other host probably restarted!\n");
-
-		bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
-		if (set_mark)
-			batadv_set_bit(seq_bits, 0);
-
-		return 1;
-	}
+	bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
+	if (set_mark)
+		batadv_set_bit(seq_bits, 0);
 
-	/* never reached */
-	return 0;
+	return 1;
 }