netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [iproute PATCH] bridge: Prevent a double space in bridge mdb show
@ 2018-02-19 16:13 Timothy Redaelli
  2018-02-23 16:14 ` Stephen Hemminger
  0 siblings, 1 reply; 2+ messages in thread
From: Timothy Redaelli @ 2018-02-19 16:13 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: netdev

Prevent a double space in "bridge mdb show" when the MDB entry is not
marked as "offload".

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
---
 bridge/mdb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bridge/mdb.c b/bridge/mdb.c
index 62dc8a0c..58c20b82 100644
--- a/bridge/mdb.c
+++ b/bridge/mdb.c
@@ -166,12 +166,12 @@ static void print_mdb_entry(FILE *f, int ifindex, struct br_mdb_entry *e,
 		if (mdb_flags)
 			jsonw_end_array(jw_global);
 	} else{
-		fprintf(f, "dev %s port %s grp %s %s %s",
+		fprintf(f, "dev %s port %s grp %s %s%s",
 			ll_index_to_name(ifindex),
 			ll_index_to_name(e->ifindex),
 			inet_ntop(af, src, abuf, sizeof(abuf)),
 			(e->state & MDB_PERMANENT) ? "permanent" : "temp",
-			(e->flags & MDB_FLAGS_OFFLOAD) ? "offload" : "");
+			(e->flags & MDB_FLAGS_OFFLOAD) ? " offload" : "");
 	}
 	if (e->vid) {
 		if (jw_global)
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [iproute PATCH] bridge: Prevent a double space in bridge mdb show
  2018-02-19 16:13 [iproute PATCH] bridge: Prevent a double space in bridge mdb show Timothy Redaelli
@ 2018-02-23 16:14 ` Stephen Hemminger
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2018-02-23 16:14 UTC (permalink / raw)
  To: Timothy Redaelli; +Cc: netdev

On Mon, 19 Feb 2018 17:13:06 +0100
Timothy Redaelli <tredaelli@redhat.com> wrote:

> Prevent a double space in "bridge mdb show" when the MDB entry is not
> marked as "offload".
> 
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>

Applied.

In iproute2-next printout has changed in this area, so this patch won't merge
to next. It looks like the json stuff might have introduced other spacing glitches though.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-02-23 16:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-19 16:13 [iproute PATCH] bridge: Prevent a double space in bridge mdb show Timothy Redaelli
2018-02-23 16:14 ` Stephen Hemminger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).