From patchwork Mon Oct 29 08:58:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 194893 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 C0BE52C0095 for ; Mon, 29 Oct 2012 19:59:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758207Ab2J2I7H (ORCPT ); Mon, 29 Oct 2012 04:59:07 -0400 Received: from contumacia.investici.org ([178.255.144.35]:54133 "EHLO contumacia.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758063Ab2J2I7B (ORCPT ); Mon, 29 Oct 2012 04:59:01 -0400 Received: from [178.255.144.35] (contumacia [178.255.144.35]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 30CB3E87DE; Mon, 29 Oct 2012 08:59:00 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 contumacia.investici.org 30CB3E87DE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1351501140; bh=a5qpiXfMFVzgy6jTyMoqgwrKihe1pw06uXExkw1l09k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=oQ2oL7oyriLAF3DYSNn7EqVjhepNiCFJZrUI39MVgkJjPtWNFTMuuMdwl5JbUkhJh p3BqNd5Hj75/TkfbP/irA1gMHBXP8Hs2RLQWq+zdpj72e6Mx2ukqqOwiF2iXQPNNUw oCZN/zKFqx8lqq5cuHZVPz9okMMABsTpMpX3sYZk= 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 05/16] batman-adv: return proper value in case of hash_add failure Date: Mon, 29 Oct 2012 09:58:06 +0100 Message-Id: <1351501097-1289-6-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1351501097-1289-1-git-send-email-ordex@autistici.org> References: <1351501097-1289-1-git-send-email-ordex@autistici.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case of hash_add failure tt_global_add() must return 0 (which means on entry insertion). Signed-off-by: Antonio Quartulli --- net/batman-adv/translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index d87d9b4..42a74e3 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -776,13 +776,13 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new global tt entry: %pM (via %pM)\n", tt_global_entry->common.addr, orig_node->orig); + ret = 1; out_remove: /* remove address from local hash if present */ batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr, "global tt received", flags & BATADV_TT_CLIENT_ROAM); - ret = 1; out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry);