[linux-next] LinuxNextTracking branch, master, updated. next-20120621

batman at open-mesh.org batman at open-mesh.org
Fri Jun 22 00:17:05 CEST 2012

The following commit has been merged in the master branch:
commit 08ad76ecc9f7f02cbe6ccbaa4abc9e9f193ed0e4
Author: Marek Lindner <lindner_marek at 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 at yahoo.de>
    Acked-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index ca53542..f9675b7 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -319,7 +319,7 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv,
-	return tot_changes;
+	return count;
 int tt_local_seq_print_text(struct seq_file *seq, void *offset)


More information about the linux-merge mailing list