The following commit has been merged in the next branch: commit 192668bd8ed24c47c8e0e1664af0b2bebfd4833b Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sat Sep 18 15:35:45 2010 +0000

batman-adv: Track references of batman_if in set_primary_if

set_primary_if exchanges the current primary interfaces with a new one. This is a new reference and thus we have to count it and decrease the count of the old primary interface.

Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

diff --git a/hard-interface.c b/hard-interface.c index f519b4b..942a44a 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -113,9 +113,17 @@ static void set_primary_if(struct bat_priv *bat_priv, { struct batman_packet *batman_packet; struct vis_packet *vis_packet; + struct batman_if *old_if;

+ if (batman_if) + hardif_hold(batman_if); + + old_if = bat_priv->primary_if; bat_priv->primary_if = batman_if;

+ if (old_if) + hardif_put(old_if); + if (!bat_priv->primary_if) return;