From patchwork Tue Apr 3 21:50:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1647 Return-Path: Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) by open-mesh.org (Postfix) with ESMTPS id 864C7600737 for ; Tue, 3 Apr 2012 23:49:30 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@autistici.org; dkim-adsp=pass Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id E129DC8661; Tue, 3 Apr 2012 21:49:29 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org E129DC8661 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1333489770; bh=i6MlXWngGlU/fb79x+9iEgKgfuJseIhdA4zXrCPCQcA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=ZFve8fhtpJ8umojMfrSBY9wdyNADIfc4u6nKjzMDgXI9drqt8eh+zQh9vCXAir53r Z+7TMfh6c3hTAaJ4q6UZFgZ1FnKgGxpIcwDW2qqNFZrb4VpG0zO4RMMZWkRVWU79ZQ 7vc3UJz4QGbBcRKtEUDqKvAeaZbEFjl3x6/xgjz0= From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 3 Apr 2012 23:50:21 +0200 Message-Id: <1333489822-27692-5-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.9.4 In-Reply-To: <1333489822-27692-1-git-send-email-ordex@autistici.org> References: <1333489822-27692-1-git-send-email-ordex@autistici.org> Subject: [B.A.T.M.A.N.] [PATCH 4/5] batman-adv: let tt_global_entry_has_orig() return the orig_entry or NULL instead of 1 or 0 only 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: Tue, 03 Apr 2012 21:49:30 -0000 Instead of returning only 1 or 0 this function has to return the found orig_entry (if any). In this way, operations that have to to modify the found orig_entry structure will not need to reiterate over the list again to find the wanted node. Signed-off-by: Antonio Quartulli --- translation-table.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/translation-table.c b/translation-table.c index 4898e99..82711b8 100644 --- a/translation-table.c +++ b/translation-table.c @@ -551,25 +551,26 @@ static void tt_changes_list_free(struct bat_priv *bat_priv) } /* find out if an orig_node is already in the list of a tt_global_entry. - * returns 1 if found, 0 otherwise */ -static bool tt_global_entry_has_orig(const struct tt_global_entry *entry, - const struct orig_node *orig_node) + * returns NULL if not found, the pointer to the orig_entry otherwise */ +static struct tt_orig_list_entry *tt_global_entry_has_orig( + const struct tt_global_entry *entry, + const struct orig_node *orig_node) { struct tt_orig_list_entry *tmp_orig_entry; const struct hlist_head *head; struct hlist_node *node; - bool found = false; + struct tt_orig_list_entry *orig_entry = NULL; rcu_read_lock(); head = &entry->orig_list; hlist_for_each_entry_rcu(tmp_orig_entry, node, head, list) { if (tmp_orig_entry->orig_node == orig_node) { - found = true; + orig_entry = tmp_orig_entry; break; } } rcu_read_unlock(); - return found; + return orig_entry; } static void tt_global_add_orig_entry(struct tt_global_entry *tt_global_entry,