From patchwork Sat Sep 18 15:23:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 358 Return-Path: Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by open-mesh.org (Postfix) with SMTP id 3F6FF154320 for ; Sat, 18 Sep 2010 17:22:05 +0200 (CEST) Received: (qmail invoked by alias); 18 Sep 2010 15:22:04 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [88.130.165.18] by mail.gmx.net (mp038) with SMTP; 18 Sep 2010 17:22:04 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX19e7vxSqzheHt41FnFZ85HhT5uKPpy/wH3nZi4V8M K5BnHllk1oaZqQ From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 18 Sep 2010 17:23:00 +0200 Message-Id: <1284823381-26943-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <201009181721.44244.sven.eckelmann@gmx.de> References: <201009181721.44244.sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Track references of batman_if in set_primary_if X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2010 15:22:05 -0000 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 --- I would like to keep that order of hold -> exchange -> put for later changes (rcu or something like that for primary_if and curr_gw). batman-adv/hard-interface.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index f519b4b..942a44a 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/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;