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

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:08:49 CEST 2011

The following commit has been merged in the master branch:
commit 53320fe3bb1b1eef1aaff8dd47aae530ebeeb1e5
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Dec 20 10:32:03 2010 -0800

    batman-adv: Return hna count on local buffer fill
    hna_local_fill_buffer must return the number of added hna entries and
    not the last checked hash bucket.
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index a19e16c..a633b5a4 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -162,7 +162,7 @@ int hna_local_fill_buffer(struct bat_priv *bat_priv,
 		atomic_set(&bat_priv->hna_local_changed, 0);
-	return i;
+	return count;
 int hna_local_seq_print_text(struct seq_file *seq, void *offset)


More information about the linux-merge mailing list