batman-adv: refactor window_protected to avoid unnecessary return statement

Reported-by: David Laight <David.Laight@aculab.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index b1824bb..840e2c6 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/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;
 }