From patchwork Sat Nov 26 14:26:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 127802 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 1BA95B7090 for ; Sun, 27 Nov 2011 01:28:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752124Ab1KZO2G (ORCPT ); Sat, 26 Nov 2011 09:28:06 -0500 Received: from nm1-vm0.bullet.mail.ukl.yahoo.com ([217.146.183.224]:20056 "HELO nm1-vm0.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751858Ab1KZO2D (ORCPT ); Sat, 26 Nov 2011 09:28:03 -0500 Received: from [217.146.183.210] by nm1.bullet.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:28:01 -0000 Received: from [77.238.184.75] by tm3.bullet.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:28:01 -0000 Received: from [127.0.0.1] by smtp144.mail.ukl.yahoo.com with NNFMP; 26 Nov 2011 14:28:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1322317681; bh=2NHd/4taUD6L3gJWry49q/WJ2JecPpQFq+V0ctjiW8c=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=sa9K9RET5kZiCQGibz3l7ZvmmzjkkaIBFtMLK+b0eyEFd8WtC1aWfIMImOI5eRcJdeWCbI++FmzQEUkBdV1ndrPsIKyrOrHFId/0rhZBRiI5f1mz0C4J4beTAUjFXqz6m3pVSafRQBkte4+f9sUghBpoNwZ0lzQSlD76+WV2BrQ= X-Yahoo-Newman-Id: 747668.28861.bm@smtp144.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: EXtcs.YVM1kSPbhZOifO9qrgLx5oZl8L9JoYXFm4oVlYLyC UsGYSeBmkZ_OyZ.E5Nwz.24Lf2iA7KyivqDD4cwzvR_t_vpGenja3He71A1V tvVd2G3.te_AO.4QiPB4fVuVj7RcpdIHHmPBW72e7ZJ12Uh3Xem9kn9WdsJW T8AOhY4dD737pFu380moPMlS0XJdBBPvTrbaMU7._EkUPg67QsUVmaw.VVrZ .XxZwFZHKqpFnO4sPEh14sW1lNXkjKsoneJMIByXpn_qCGJPkAlnkLtS7R2W yNGBEfq3Zs7x67vJqVB2JtBj5hokk9YH1S4BF3u5E1ly52qIA7xYVNyk_gSc LbdktbT9GPhNDXXHd.cSzJwZ5filOAUdQ7lVYSH_8Ye8vWmBzPr8xEw-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp144.mail.ukl.yahoo.com with SMTP; 26 Nov 2011 14:27:57 +0000 GMT From: Marek Lindner To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Antonio Quartulli , Sven Eckelmann Subject: [PATCH 02/10] batman-adv: tt_global_del_orig() has to print the correct message Date: Sat, 26 Nov 2011 22:26:44 +0800 Message-Id: <1322317612-7770-3-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1322317612-7770-1-git-send-email-lindner_marek@yahoo.de> References: <1322317612-7770-1-git-send-email-lindner_marek@yahoo.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Antonio Quartulli When deleting the entries, tt_global_del_orig() has to print the message passed as argument instead of a static one. Signed-off-by: Antonio Quartulli Signed-off-by: Sven Eckelmann --- net/batman-adv/translation-table.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index c7aafc7..1db9d96 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -735,9 +735,10 @@ void tt_global_del_orig(struct bat_priv *bat_priv, if (tt_global_entry->orig_node == orig_node) { bat_dbg(DBG_TT, bat_priv, "Deleting global tt entry %pM " - "(via %pM): originator time out\n", + "(via %pM): %s\n", tt_global_entry->addr, - tt_global_entry->orig_node->orig); + tt_global_entry->orig_node->orig, + message); hlist_del_rcu(node); tt_global_entry_free_ref(tt_global_entry); }