The following commit has been merged in the master branch: commit 2674c15870f888cb732a564fc504ce17654afc64 Author: Sven Eckelmann sven@narfation.org Date: Fri Jan 28 18:34:05 2011 +0100

batman-adv: Remove vis info on hashing errors

A newly created vis info object must be removed when it couldn't be added to the hash. The old_info which has to be replaced was already removed and isn't related to the hash anymore.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index f69a374..0be55be 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@ -444,7 +444,7 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv, info); if (hash_added < 0) { /* did not work (for some reason) */ - kref_put(&old_info->refcount, free_info); + kref_put(&info->refcount, free_info); info = NULL; }