The following commit has been merged in the master branch: commit 3786b952007820002f7dba8003b00d8e76887191 Author: Antonio Quartulli ordex@autistici.org Date: Fri Mar 4 21:36:40 2011 +0000

batman-adv: orig_node must be freed after in case of timeout

This patch corrects commit 4c4236064501e85915087f00a370df8d9f43028d in which bucket_free_orig_rcu() has been removed but without being replaced. In _push_orig(), the orig_node was not freed anymore after a timeout.

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/originator.c b/originator.c index 53753d3..0b91330 100644 --- a/originator.c +++ b/originator.c @@ -349,6 +349,7 @@ static void _purge_orig(struct bat_priv *bat_priv) if (orig_node->gw_flags) gw_node_delete(bat_priv, orig_node); hlist_del_rcu(node); + orig_node_free_ref(orig_node); continue; }