|
 |
0ac2f3 |
From 28a6ef808bd5c196c2259f7841a97c1ba703479d Mon Sep 17 00:00:00 2001
|
|
|
0ac2f3 |
From: Andrea Claudi <aclaudi@redhat.com>
|
|
|
0ac2f3 |
Date: Thu, 30 Apr 2020 12:32:41 +0200
|
|
|
0ac2f3 |
Subject: [PATCH] ip link: xstats: fix TX IGMP reports string
|
|
|
0ac2f3 |
|
|
|
0ac2f3 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1796041
|
|
|
0ac2f3 |
Upstream Status: iproute2.git commit 5cdeb77cd6ec2
|
|
|
0ac2f3 |
|
|
|
0ac2f3 |
commit 5cdeb77cd6ec26f0a7103dfb21494a6a43903206
|
|
|
0ac2f3 |
Author: Andrea Claudi <aclaudi@redhat.com>
|
|
|
0ac2f3 |
Date: Wed Jan 29 15:31:11 2020 +0100
|
|
|
0ac2f3 |
|
|
|
0ac2f3 |
ip link: xstats: fix TX IGMP reports string
|
|
|
0ac2f3 |
|
|
|
0ac2f3 |
This restore the string format we have before jsonification, adding a
|
|
|
0ac2f3 |
missing space between v2 and v3 on TX IGMP reports string.
|
|
|
0ac2f3 |
|
|
|
0ac2f3 |
Fixes: a9bc23a79227a ("ip: bridge: add xstats json support")
|
|
|
0ac2f3 |
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
|
|
|
0ac2f3 |
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
0ac2f3 |
---
|
|
|
0ac2f3 |
ip/iplink_bridge.c | 2 +-
|
|
|
0ac2f3 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0ac2f3 |
|
|
|
0ac2f3 |
diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
|
|
|
0ac2f3 |
index 06f736d4dc710..868ea6e266ebe 100644
|
|
|
0ac2f3 |
--- a/ip/iplink_bridge.c
|
|
|
0ac2f3 |
+++ b/ip/iplink_bridge.c
|
|
|
0ac2f3 |
@@ -742,7 +742,7 @@ static void bridge_print_stats_attr(struct rtattr *attr, int ifindex)
|
|
|
0ac2f3 |
print_string(PRINT_FP, NULL, "%-16s ", "");
|
|
|
0ac2f3 |
print_u64(PRINT_ANY, "tx_v1", "TX: v1 %llu ",
|
|
|
0ac2f3 |
mstats->igmp_v1reports[BR_MCAST_DIR_TX]);
|
|
|
0ac2f3 |
- print_u64(PRINT_ANY, "tx_v2", "v2 %llu",
|
|
|
0ac2f3 |
+ print_u64(PRINT_ANY, "tx_v2", "v2 %llu ",
|
|
|
0ac2f3 |
mstats->igmp_v2reports[BR_MCAST_DIR_TX]);
|
|
|
0ac2f3 |
print_u64(PRINT_ANY, "tx_v3", "v3 %llu\n",
|
|
|
0ac2f3 |
mstats->igmp_v3reports[BR_MCAST_DIR_TX]);
|
|
|
0ac2f3 |
--
|
|
|
0ac2f3 |
2.25.4
|
|
|
0ac2f3 |
|