1 files changed, 29 insertions, 34 deletions

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index fef3689bcf23..e4e6d8cd47e6 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -701,48 +701,43 @@ void tipc_bcbearer_sort(void)
 
 int tipc_bclink_stats(char *buf, const u32 buf_size)
 {
-        struct print_buf pb;
+        int ret;
+        struct tipc_stats *s;
 
         if (!bcl)
                 return 0;
 
-        tipc_printbuf_init(&pb, buf, buf_size);
-
         spin_lock_bh(&bc_lock);
 
-        tipc_printf(&pb, "Link <%s>\n"
-                         "  Window:%u packets\n",
-                    bcl->name, bcl->queue_limit[0]);
-        tipc_printf(&pb, "  RX packets:%u fragments:%u/%u bundles:%u/%u\n",
-                    bcl->stats.recv_info,
-                    bcl->stats.recv_fragments,
-                    bcl->stats.recv_fragmented,
-                    bcl->stats.recv_bundles,
-                    bcl->stats.recv_bundled);
-        tipc_printf(&pb, "  TX packets:%u fragments:%u/%u bundles:%u/%u\n",
-                    bcl->stats.sent_info,
-                    bcl->stats.sent_fragments,
-                    bcl->stats.sent_fragmented,
-                    bcl->stats.sent_bundles,
-                    bcl->stats.sent_bundled);
-        tipc_printf(&pb, "  RX naks:%u defs:%u dups:%u\n",
-                    bcl->stats.recv_nacks,
-                    bcl->stats.deferred_recv,
-                    bcl->stats.duplicates);
-        tipc_printf(&pb, "  TX naks:%u acks:%u dups:%u\n",
-                    bcl->stats.sent_nacks,
-                    bcl->stats.sent_acks,
-                    bcl->stats.retransmitted);
-        tipc_printf(&pb, "  Congestion bearer:%u link:%u  Send queue max:%u avg:%u\n",
-                    bcl->stats.bearer_congs,
-                    bcl->stats.link_congs,
-                    bcl->stats.max_queue_sz,
-                    bcl->stats.queue_sz_counts
-                    ? (bcl->stats.accu_queue_sz / bcl->stats.queue_sz_counts)
-                    : 0);
+        s = &bcl->stats;
+
+        ret = tipc_snprintf(buf, buf_size, "Link <%s>\n"
+                            "  Window:%u packets\n",
+                            bcl->name, bcl->queue_limit[0]);
+        ret += tipc_snprintf(buf + ret, buf_size - ret,
+                             "  RX packets:%u fragments:%u/%u bundles:%u/%u\n",
+                             s->recv_info, s->recv_fragments,
+                             s->recv_fragmented, s->recv_bundles,
+                             s->recv_bundled);
+        ret += tipc_snprintf(buf + ret, buf_size - ret,
+                             "  TX packets:%u fragments:%u/%u bundles:%u/%u\n",
+                             s->sent_info, s->sent_fragments,
+                             s->sent_fragmented, s->sent_bundles,
+                             s->sent_bundled);
+        ret += tipc_snprintf(buf + ret, buf_size - ret,
+                             "  RX naks:%u defs:%u dups:%u\n",
+                             s->recv_nacks, s->deferred_recv, s->duplicates);
+        ret += tipc_snprintf(buf + ret, buf_size - ret,
+                             "  TX naks:%u acks:%u dups:%u\n",
+                             s->sent_nacks, s->sent_acks, s->retransmitted);
+        ret += tipc_snprintf(buf + ret, buf_size - ret,
+                             "  Congestion bearer:%u link:%u  Send queue max:%u avg:%u\n",
+                             s->bearer_congs, s->link_congs, s->max_queue_sz,
+                             s->queue_sz_counts ?
+                             (s->accu_queue_sz / s->queue_sz_counts) : 0);
 
         spin_unlock_bh(&bc_lock);
-        return tipc_printbuf_validate(&pb);
+        return ret;
 }
 
 int tipc_bclink_reset_stats(void)