From f6011cec5bba8d3484b0e147b3a8ff155eefe50a Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 11 Jul 2012 19:27:56 -0400 Subject: [PATCH] --- yaml --- r: 315368 b: refs/heads/master c: 5deedde9fa65c494c9747dd66b1721be90991b64 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/link.c | 24 +++++++----------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 0d2fb5fc2b8d..3f82e353d022 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 568fc588fce85602e4e2c7573f6f912311306b72 +refs/heads/master: 5deedde9fa65c494c9747dd66b1721be90991b64 diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c index 9ba70c971142..a9a8b866d30a 100644 --- a/trunk/net/tipc/link.c +++ b/trunk/net/tipc/link.c @@ -3009,26 +3009,16 @@ u32 tipc_link_get_max_pkt(u32 dest, u32 selector) static void link_print(struct tipc_link *l_ptr, const char *str) { - char print_area[256]; - struct print_buf pb; - struct print_buf *buf = &pb; - - tipc_printbuf_init(buf, print_area, sizeof(print_area)); - - tipc_printf(buf, str); - tipc_printf(buf, "Link %x<%s>:", - l_ptr->addr, l_ptr->b_ptr->name); + pr_info("%s Link %x<%s>:", str, l_ptr->addr, l_ptr->b_ptr->name); if (link_working_unknown(l_ptr)) - tipc_printf(buf, ":WU"); + pr_cont(":WU\n"); else if (link_reset_reset(l_ptr)) - tipc_printf(buf, ":RR"); + pr_cont(":RR\n"); else if (link_reset_unknown(l_ptr)) - tipc_printf(buf, ":RU"); + pr_cont(":RU\n"); else if (link_working_working(l_ptr)) - tipc_printf(buf, ":WW"); - tipc_printf(buf, "\n"); - - tipc_printbuf_validate(buf); - pr_info("%s", print_area); + pr_cont(":WW\n"); + else + pr_cont("\n"); }