| Message ID | 09c2d14a14282f74739012d70f4a1cf103bee2e3.1519054060.git.tredaelli@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [iproute] bridge: Prevent a double space in bridge mdb show | expand |
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.
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)
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(-)