The following commit has been merged in the master branch: commit f5ca81fd9886d4a2c330ced7f9d23fd41c5e847c Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Mar 17 15:28:33 2012 +0800
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
diff --git a/routing.c b/routing.c index 0950c53..795d3af 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; }