From patchwork Wed Nov 13 23:20:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Bennett X-Patchwork-Id: 1194518 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=alliedtelesis.co.nz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=alliedtelesis.co.nz header.i=@alliedtelesis.co.nz header.b="oSzbVPEf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47D0vw0WYsz9sPJ for ; Thu, 14 Nov 2019 10:20:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbfKMXUW (ORCPT ); Wed, 13 Nov 2019 18:20:22 -0500 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:33556 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726528AbfKMXUW (ORCPT ); Wed, 13 Nov 2019 18:20:22 -0500 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 6E644891AF; Thu, 14 Nov 2019 12:20:19 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1573687219; bh=CpYFRRes09wx5hmQ80fisE1Uilx3AVAgdklymOJlF1Q=; h=From:To:Cc:Subject:Date; b=oSzbVPEfCdYG4NnFOKkByolXlqgbmQE5KmGUROhGjnjjW6F4+VeBmKUpYnN7I9DnR aefFFI+kR0dJvZSMwhOlwhECI4Bl0gg0HZe409++QLmEbM0b/yH2O2YYhazH2tuc58 6e5i3qJ85jo9wWEVMUEfaKMKGmICKpHUoo/3xlyIe/DCnVK9ysBeXZM18/gFOraxUi zEmF18TuJWNgKvni3TUiloJhacR1XNiiwQ1FFy9RjClPeaSPB+dHaumuWaEJg+Xw9I GZLuFIORbCJSDzSAe+HdY5No19eXInoaoZElRs714RYQpfAr0pg6o+Rb1yExtOJX2M M9dDhc2KFMzNw== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 8, 10121) id ; Thu, 14 Nov 2019 12:20:19 +1300 Received: from mattb-dl.ws.atlnz.lc (mattb-dl.ws.atlnz.lc [10.33.25.30]) by smtp (Postfix) with ESMTP id 0A86913EEB5; Thu, 14 Nov 2019 12:20:13 +1300 (NZDT) Received: by mattb-dl.ws.atlnz.lc (Postfix, from userid 1672) id 2AF7B141874; Thu, 14 Nov 2019 12:20:14 +1300 (NZDT) From: Matt Bennett To: jon.maloy@ericsson.com, ying.xue@windriver.com, davem@davemloft.net, netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, Matt Bennett Subject: [PATCH] tipc: add back tipc prefix to log messages Date: Thu, 14 Nov 2019 12:20:03 +1300 Message-Id: <20191113232003.29436-1-matt.bennett@alliedtelesis.co.nz> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 x-atlnz-ls: pat Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The tipc prefix for log messages generated by tipc was removed in commit 07f6c4bc048a ("tipc: convert tipc reference table to use generic rhashtable"). This is still a useful prefix so add it back. Signed-off-by: Matt Bennett Acked-by: Jon Maloy --- net/tipc/core.c | 2 -- net/tipc/core.h | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/net/tipc/core.c b/net/tipc/core.c index 23cb379a93d6..8f35060a24e1 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -34,8 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "core.h" #include "name_table.h" #include "subscr.h" diff --git a/net/tipc/core.h b/net/tipc/core.h index 60d829581068..3042f654e0af 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h @@ -60,6 +60,12 @@ #include #include +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + struct tipc_node; struct tipc_bearer; struct tipc_bc_base;