The following commit has been merged in the batman-adv/next branch: commit 177927859f62c3a6a47b40f4e1151cbd2b91d6bf Author: Sven Eckelmann sven@narfation.org Date: Wed Jul 18 09:07:07 2012 +0200

batman-adv: Fix wrong multiline comment ending

This regression was introduced in 724d05c8215e4e8186097121595ef20b6ba601b7

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 172d50b..37ae4a9 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -688,7 +688,8 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global, orig_entry = batadv_tt_global_orig_entry_find(tt_global, orig_node); if (orig_entry) { /* refresh the ttvn: the current value could be a bogus one that - * was added during a "temporary client detection" */ + * was added during a "temporary client detection" + */ orig_entry->ttvn = ttvn; goto out; }