From patchwork Fri Mar 4 01:13:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 895 Return-Path: X-Greylist: delayed 1418 seconds by postgrey-1.32 at open-mesh; Fri, 04 Mar 2011 02:37:09 CET Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@autistici.org; dkim-adsp=pass Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) by open-mesh.org (Postfix) with ESMTPS id 8CE29154033 for ; Fri, 4 Mar 2011 02:37:09 +0100 (CET) Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id E802BC866E; Fri, 4 Mar 2011 01:13:20 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.6.0 confino.investici.org E802BC866E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1299201204; bh=3nZr9BbMpDpH0CfKCebFJ9m6MyPiXiZ6dJVHEQ ZkLTA=; h=From:To:Cc:Subject:Date:Message-Id; b=MEJ20IPUIgqmKOjpZYP XqF3BR/JQVG3361L7pOGiyyWDGQFocbVFVBXJz/MXzlivti+PzluWFI/rTvJVipKXsJ fpySFpl8ER19GE8N2gUQJN7oUtfECXJYNmdTvVOAQY2wVmw6iMWLjAgHqJ7NWIbxk2k FNVkA4FSpTbpZ3ib3Q= From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 4 Mar 2011 02:13:16 +0100 Message-Id: <1299201196-6188-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.3.4 X-Mailman-Approved-At: Fri, 04 Mar 2011 02:42:12 +0100 Cc: Marek Lindner , Antonio Quartulli Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: orig_node must be freed after in case of timeout X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 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: Fri, 04 Mar 2011 01:37:09 -0000 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: Sven Eckelmann Signed-off-by: Marek Lindner --- originator.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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; }