Re: pull request: batman-adv 2012-06-25

From: Antonio Quartulli <redacted>
Date: Mon, 25 Jun 2012 08:54:24 +0200

this is another set of changes intended for net-next/linux-3.6.

This patchset is entirely composed by "namespace renaming" patches.

Please, let me know if there is any problem.

Pulled, but you really, _REALLY_, should have let me pull 'net'
into 'net-next' to resolve the conflicts in translation-table.c
before sending this work to me.

I did that merge before getting to this pull request and did my
best merging things together.

But I know I made mistakes, so please send me whatever fixups
are necessary.

Thanks.

Hello David,

here are our two fixes to recover from the little problems introduced during the
last conflict resolution involving translation-table.c.
Sorry for the inconvenient.

Thank you,
	Antonio

During the last merge involving translation-table.c something went wrong and two
lines disappeared from translation-table.c. This patch recovers them.

Signed-off-by: Antonio Quartulli <redacted>
---
 net/batman-adv/translation-table.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index e4f27a8..c673b58 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c

@@ -149,6 +149,8 @@ static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu)
 static void
 batadv_tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry)
 {
+	/* to avoid race conditions, immediately decrease the tt counter */
+	atomic_dec(&orig_entry->orig_node->tt_size);
 	call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu);
 }
 

-- 
1.7.9.4

From: Antonio Quartulli <redacted>
Date: Tue, 26 Jun 2012 08:49:49 +0200

here are our two fixes to recover from the little problems introduced during the
last conflict resolution involving translation-table.c.
Sorry for the inconvenient.

Both applied, thanks.