RE: [PATCH] tipc: add back tipc prefix to log messages

[Jon Maloy]

Acked-by: Jon Maloy <jon.maloy@xxxxxxxxxxxx>

> -----Original Message-----
> From: netdev-owner@xxxxxxxxxxxxxxx <netdev-owner@xxxxxxxxxxxxxxx> On Behalf Of Matt Bennett
> Sent: 13-Nov-19 18:20
> To: Jon Maloy <jon.maloy@xxxxxxxxxxxx>; ying.xue@xxxxxxxxxxxxx; davem@xxxxxxxxxxxxx;
> netdev@xxxxxxxxxxxxxxx; tipc-discussion@xxxxxxxxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx; Matt Bennett <matt.bennett@xxxxxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxxxxx>
> ---
>  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