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

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

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 1d6fb77..da220cf 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1142,8 +1142,9 @@ int bla_init(struct bat_priv *bat_priv) htons(crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN)); hardif_free_ref(primary_if); - } else + } else { bat_priv->claim_dest.group = 0; /* will be set later */ + }

/* initialize the duplicate list */ for (i = 0; i < DUPLIST_SIZE; i++) diff --git a/translation-table.c b/translation-table.c index cdc7322..b889806 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1618,8 +1618,9 @@ bool send_tt_response(struct bat_priv *bat_priv, return true;

return send_my_tt_response(bat_priv, tt_request); - } else + } else { return send_other_tt_response(bat_priv, tt_request); + } }

static void _tt_update_changes(struct bat_priv *bat_priv,