From patchwork Fri Jan 6 20:31:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1492 Return-Path: Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) by open-mesh.org (Postfix) with ESMTPS id 9B38860080D for ; Fri, 6 Jan 2012 21:32:10 +0100 (CET) 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 E9700C864B; Fri, 6 Jan 2012 20:32:09 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org E9700C864B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1325881930; bh=03UL2F5dHuCBho5I+rftCCYtGX9e5gBROFIe/KmhSjo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=o5lpiMPaTUiiBuvxvfRnVN4EQCyB8EWtOkHmz4oFC2F9dsEOMVrD/DpqhDGdqHV6c ZW7uFjN2zxtielYpDq7J1SgOEXIxe2sM1tZ6F0C04LRGb3EcL+20ayIJVXCTsDb9Jk F2jVWxmFSW797x8y15chniFzlA9ah5Q8U0/VHnFo= From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 6 Jan 2012 21:31:34 +0100 Message-Id: <1325881894-18603-2-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1325881894-18603-1-git-send-email-ordex@autistici.org> References: <1325881894-18603-1-git-send-email-ordex@autistici.org> Subject: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: move debug print into tt_local_set_pending 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, 06 Jan 2012 20:32:10 -0000 Each tt_local_set_pending is always followed by a bat_dbg invocation. This patch moves the latter into the function body in order to avoid to rewrite it all the times. Signed-off-by: Antonio Quartulli --- translation-table.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/translation-table.c b/translation-table.c index b493ab4..d105cbd 100644 --- a/translation-table.c +++ b/translation-table.c @@ -355,7 +355,7 @@ out: static void tt_local_set_pending(struct bat_priv *bat_priv, struct tt_local_entry *tt_local_entry, - uint16_t flags) + uint16_t flags, const char *message) { tt_local_event(bat_priv, tt_local_entry->common.addr, tt_local_entry->common.flags | flags); @@ -364,6 +364,9 @@ static void tt_local_set_pending(struct bat_priv *bat_priv, * to be kept in the table in order to send it in a full table * response issued before the net ttvn increment (consistency check) */ tt_local_entry->common.flags |= TT_CLIENT_PENDING; + + bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: " + "%s\n", tt_local_entry->common.addr, message); } void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr, @@ -376,10 +379,7 @@ void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr, goto out; tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL | - (roaming ? TT_CLIENT_ROAM : NO_FLAGS)); - - bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: " - "%s\n", tt_local_entry->common.addr, message); + (roaming ? TT_CLIENT_ROAM : NO_FLAGS), message); out: if (tt_local_entry) tt_local_entry_free_ref(tt_local_entry); @@ -417,10 +417,7 @@ static void tt_local_purge(struct bat_priv *bat_priv) continue; tt_local_set_pending(bat_priv, tt_local_entry, - TT_CLIENT_DEL); - bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) " - "pending to be removed: timed out\n", - tt_local_entry->common.addr); + TT_CLIENT_DEL, "timed out"); } spin_unlock_bh(list_lock); }