The following commit has been merged in the master branch: commit 06738bfffeba54435d88a002cb75004101d07492 Author: Antonio Quartulli ordex@ritirata.org Date: Tue Dec 21 02:16:28 2010 +0000

batman-adv: Modifing hna_local_fill_buffer() return value

After changeset 1888, the return value of hna_local_fill_buffer() has not been changed to _count_. In this way an eroneous num_hna was calculated before sending the new OGM packet.

Signed-off-by: Antonio Quartulli ordex@ritirata.org

diff --git a/translation-table.c b/translation-table.c index a19e16c..a633b5a 100644 --- a/translation-table.c +++ b/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);

spin_unlock_bh(&bat_priv->hna_lhash_lock); - return i; + return count; }

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