From patchwork Tue Jun 26 06:49:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 167317 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9722AB7005 for ; Tue, 26 Jun 2012 16:49:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755577Ab2FZGtk (ORCPT ); Tue, 26 Jun 2012 02:49:40 -0400 Received: from investici.nine.ch ([217.150.252.179]:38562 "EHLO confino.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754711Ab2FZGtj (ORCPT ); Tue, 26 Jun 2012 02:49:39 -0400 Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id DCF5AC86E6; Tue, 26 Jun 2012 06:49:37 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org DCF5AC86E6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1340693378; bh=LJ3c+9RcUBQVOpsX4jWz+j3A58P5iDSmNBOBEV6JT4g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=RlJsuowKZJ8w3qbOG83UjbHK3CZxSKMOAvASgLnj6SjWuI9nONOkuZxNU/7laKT5w jDlCYYB6C1aNcjC6MKHoxTw2NU1rV/N96O2qpYuIeET9KMBSrViWug8qkgGWhwuzCQ 6lnsYYMbUySKI0uk+xkjO+CDKBsezkln5aB9WBQ4= From: Antonio Quartulli To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Antonio Quartulli Subject: [PATCH 2/2 net-next] batman-adv: fix global TT entry deletion Date: Tue, 26 Jun 2012 08:49:51 +0200 Message-Id: <1340693391-16434-3-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.9.4 In-Reply-To: <1340693391-16434-1-git-send-email-ordex@autistici.org> References: <20120625.161933.730861831753419928.davem@davemloft.net> <1340693391-16434-1-git-send-email-ordex@autistici.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org During the last merge involving translation-table.c something went wrong and two lines disappeared from translation-table.c. This patch recovers them. Signed-off-by: Antonio Quartulli --- net/batman-adv/translation-table.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index e4f27a8..c673b58 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -149,6 +149,8 @@ static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu) static void batadv_tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry) { + /* to avoid race conditions, immediately decrease the tt counter */ + atomic_dec(&orig_entry->orig_node->tt_size); call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu); }