batman-adv: fix global TT entry deletion

Antonio Quartulli · davem330 · commit 29cb99de4daf · 2012-06-25T23:54:32.000-07:00
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 &lt;ordex@autistici.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,8 @@ static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu)`
`149`	`149`	`static void`
`150`	`150`	`batadv_tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry)`
`151`	`151`	`{`
	`152`	`+ /* to avoid race conditions, immediately decrease the tt counter */`
	`153`	`+ atomic_dec(&orig_entry->orig_node->tt_size);`
`152`	`154`	`call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu);`
`153`	`155`	`}`
`154`	`156`