From e77e552d5814bf34ec65b8342875990c7f085edc Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Wed, 19 Sep 2018 20:00:42 +0200
Subject: [PATCH] bridge/mdb: fix missing new line when show bridge mdb

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1625500
Upstream Status: iproute2.git commit 92bba4ed4016a

commit 92bba4ed4016af3ce7f7071d3c37f2cb34f240f5
Author: Hangbin Liu <liuhangbin@gmail.com>
Date:   Wed Sep 12 09:39:44 2018 +0800

    bridge/mdb: fix missing new line when show bridge mdb

    The bridge mdb show is broken on current iproute2. e.g.
    ]# bridge mdb show
    34: br0  veth0_br  224.1.1.2  temp 34: br0  veth0_br  224.1.1.1  temp

    After fix:
    ]# bridge mdb show
    34: br0  veth0_br  224.1.1.2  temp
    34: br0  veth0_br  224.1.1.1  temp

    v2: Use json print lib as Stephen suggested.
    v3: No need to use is_json_context() as print_string() could handle both cases.
    v4: use new function print_nl() to print new line in non-json mode.

    Reported-by: Ying Xu <yinxu@redhat.com>
    Fixes: c7c1a1ef51aea ("bridge: colorize output and use JSON print library")
    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
    Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 bridge/mdb.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bridge/mdb.c b/bridge/mdb.c
index f38dc67..a7b7979 100644
--- a/bridge/mdb.c
+++ b/bridge/mdb.c
@@ -107,6 +107,10 @@ static void br_print_router_ports(FILE *f, struct rtattr *attr,
 			fprintf(f, "%s ", port_ifname);
 		}
 	}
+
+	if (!show_stats)
+		print_nl();
+
 	close_json_array(PRINT_JSON, NULL);
 }
 
@@ -164,6 +168,8 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e,
 		print_string(PRINT_ANY, "timer", " %s",
 			     format_timer(timer));
 	}
+
+	print_nl();
 	close_json_object();
 }
 
-- 
1.8.3.1