From 1eeb6fdac8707c5391f73830582344671310c5a1 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Sun, 7 Aug 2016 12:37:03 -0700 Subject: [PATCH] bridge: vlan json: skip ports with empty vlans The non-json output prints 'None' for such vlans. And this can garble json output. Fixes: d82a49ce85f0 ("bridge: add json support for bridge vlan show") Signed-off-by: Roopa Prabhu --- bridge/vlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge/vlan.c b/bridge/vlan.c index f262cc7f..c2e635fc 100644 --- a/bridge/vlan.c +++ b/bridge/vlan.c @@ -212,7 +212,7 @@ static int print_vlan(const struct sockaddr_nl *who, /* if AF_SPEC isn't there, vlan table is not preset for this port */ if (!tb[IFLA_AF_SPEC]) { - if (!filter_vlan) + if (!filter_vlan && !jw_global) fprintf(fp, "%s\tNone\n", ll_index_to_name(ifm->ifi_index)); return 0;