The following commit has been merged in the master branch: commit 96741ade15187bfde3dddc4092a88ba7a7c9183c Author: Sven Eckelmann sven@narfation.org Date: Wed Mar 7 09:07:47 2012 +0100

batman-adv: Use {} braces consistent on the arms of a statement

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 01b66d4..7f8e158 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -237,8 +237,9 @@ int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, "old packet received, start protection\n");

return 0; - } else + } else { return 1; + } } return 0; }