[iproute2 PATCH v2] bridge: fix vlan show stats formatting
From: Tobias Jungel <hidden>
Date: 2018-10-27 06:37:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
The output of -statistics vlan show was broken previous change for json output. This aligns the format to vlan show. v2: fixed too greedy deletion that caused a -Wmaybe-uninitialized Signed-off-by: Tobias Jungel <redacted> --- bridge/vlan.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bridge/vlan.c b/bridge/vlan.c
index a111d5e6..d075a42d 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c@@ -484,7 +484,7 @@ static void print_vlan_stats_attr(struct rtattr *attr, int ifindex) rem = RTA_PAYLOAD(list); ifname = ll_index_to_name(ifindex); - open_json_object(ifname); + open_vlan_port(ifindex); print_color_string(PRINT_FP, COLOR_IFNAME, NULL, "%-16s", ifname);
@@ -505,8 +505,7 @@ static void print_vlan_stats_attr(struct rtattr *attr, int ifindex) print_one_vlan_stats(vstats); } - close_json_object(); - + close_vlan_port(); } static int print_vlan_stats(struct nlmsghdr *n, void *arg)