The following commit has been merged in the master branch: commit e252cf1719d596010b52fe55384f0b7211c3b723 Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Apr 23 16:32:55 2012 +0800

batman-adv: return added entries instead of number of possibly added entries

Signed-off-by: Marek Lindner lindner_marek@yahoo.de Acked-by: Antonio Quartulli ordex@autistici.org

diff --git a/translation-table.c b/translation-table.c index f8f207a..88c62f1 100644 --- a/translation-table.c +++ b/translation-table.c @@ -319,7 +319,7 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv, } spin_unlock_bh(&bat_priv->tt_buff_lock);

- return tot_changes; + return count; }

int tt_local_seq_print_text(struct seq_file *seq, void *offset)