| Message ID | 20191113232003.29436-1-matt.bennett@alliedtelesis.co.nz |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | tipc: add back tipc prefix to log messages | expand |
Acked-by: Jon Maloy <jon.maloy@ericsson.com> > -----Original Message----- > From: netdev-owner@vger.kernel.org <netdev-owner@vger.kernel.org> On Behalf Of Matt Bennett > Sent: 13-Nov-19 18:20 > To: Jon Maloy <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 <matt.bennett@alliedtelesis.co.nz> > Subject: [PATCH] tipc: add back tipc prefix to log messages > > 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 <matt.bennett@alliedtelesis.co.nz> > --- > 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 <linux/rhashtable.h> > #include <net/genetlink.h> > > +#ifdef pr_fmt > +#undef pr_fmt > +#endif > + > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > + > struct tipc_node; > struct tipc_bearer; > struct tipc_bc_base; > -- > 2.24.0
From: Matt Bennett <matt.bennett@alliedtelesis.co.nz> Date: Thu, 14 Nov 2019 12:20:03 +1300 > 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 <matt.bennett@alliedtelesis.co.nz> Applied.
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 <linux/rhashtable.h> #include <net/genetlink.h> +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + struct tipc_node; struct tipc_bearer; struct tipc_bc_base;
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 <matt.bennett@alliedtelesis.co.nz> --- net/tipc/core.c | 2 -- net/tipc/core.h | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-)